gl/lib/regcomp.c.diff

   1 diff --git a/lib/regcomp.c b/lib/regcomp.c
   2 index 6d5525a..c9331d4 100644
   3 --- a/lib/regcomp.c
   4 +++ b/lib/regcomp.c
   5 @@ -539,7 +539,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
   6      size_t errbuf_size;
   7  #else /* size_t might promote */
   8  size_t
   9 -regerror (int errcode, const regex_t *_Restrict_ preg,
  10 +regerror (int errcode, const regex_t *_Restrict_ preg _UNUSED_PARAMETER_,
  11           char *_Restrict_ errbuf, size_t errbuf_size)
  12  #endif
  13  {
  14 @@ -1421,7 +1421,7 @@ calc_first (void *extra, bin_tree_t *node)
  15
  16  /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
  17  static reg_errcode_t
  18 -calc_next (void *extra, bin_tree_t *node)
  19 +calc_next (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
  20  {
  21    switch (node->token.type)
  22      {
  23 @@ -2807,8 +2807,10 @@ build_range_exp (const reg_syntax_t syntax,
  24  static reg_errcode_t
  25  internal_function
  26  # ifdef RE_ENABLE_I18N
  27 -build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
  28 -                       Idx *coll_sym_alloc, const unsigned char *name)
  29 +build_collating_symbol (bitset_t sbcset,
  30 +                        re_charset_t *mbcset _UNUSED_PARAMETER_,
  31 +                       Idx *coll_sym_alloc _UNUSED_PARAMETER_,
  32 +                        const unsigned char *name)
  33  # else /* not RE_ENABLE_I18N */
  34  build_collating_symbol (bitset_t sbcset, const unsigned char *name)
  35  # endif /* not RE_ENABLE_I18N */
  36 @@ -3392,7 +3394,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
  37
  38  static reg_errcode_t
  39  parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
  40 -                      re_token_t *token, int token_len, re_dfa_t *dfa,
  41 +                      re_token_t *token, int token_len,
  42 +                      re_dfa_t *dfa _UNUSED_PARAMETER_,
  43                        reg_syntax_t syntax, bool accept_hyphen)
  44  {
  45  #ifdef RE_ENABLE_I18N
  46 @@ -3479,8 +3482,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
  47
  48  static reg_errcode_t
  49  #ifdef RE_ENABLE_I18N
  50 -build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
  51 -                  Idx *equiv_class_alloc, const unsigned char *name)
  52 +build_equiv_class (bitset_t sbcset,
  53 +                   re_charset_t *mbcset _UNUSED_PARAMETER_,
  54 +                  Idx *equiv_class_alloc _UNUSED_PARAMETER_,
  55 +                  const unsigned char *name)
  56  #else /* not RE_ENABLE_I18N */
  57  build_equiv_class (bitset_t sbcset, const unsigned char *name)
  58  #endif /* not RE_ENABLE_I18N */
  59 @@ -3886,7 +3891,7 @@ free_token (re_token_t *node)
  60     and its children. */
  61
  62  static reg_errcode_t
  63 -free_tree (void *extra, bin_tree_t *node)
  64 +free_tree (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
  65  {
  66    free_token (&node->token);
  67    return REG_NOERROR;