diff options
author | Jim Meyering <meyering@fb.com> | 2016-03-14 08:59:56 -0700 |
---|---|---|
committer | Jim Meyering <meyering@fb.com> | 2016-03-15 07:36:12 -0700 |
commit | c18b3699e1b8c4ad2739761f2b9c306ff2303322 (patch) | |
tree | 2715bf265d5468b2965af4646092aebf26a23136 /gl/lib/regcomp.c.diff | |
parent | e735d417fb2e5c7427b3622f2a78e65e450b49a8 (diff) | |
download | coreutils-c18b3699e1b8c4ad2739761f2b9c306ff2303322.tar.xz |
maint: remove gl/lib/reg*.c.diff; no longer needed
* gl/lib/regcomp.c.diff: Remove file, now that gnulib's
regcomp.c compiles regex.c with -Wno-unused-parameter.
* gl/lib/regex_internal.h.diff: Likewise.
* gl/lib/regex_internal.c.diff: This file induced a change to ensure
that the "Idx" type was unsigned and to remove a few "VAR < 0"
comparisons. These days, it is probably fine to stay in sync with
gnulib/glibc's copies
of these files, so remove these patches, too.
* gl/lib/regexec.c.diff: Likewise.
Prompted by a report by Assaf Gordon and a suggestion from Paul Eggert.
Diffstat (limited to 'gl/lib/regcomp.c.diff')
-rw-r--r-- | gl/lib/regcomp.c.diff | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff deleted file mode 100644 index 2f5107b10..000000000 --- a/gl/lib/regcomp.c.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff --git i/lib/regcomp.c w/lib/regcomp.c -index 6de9b72..bd069dd 100644 ---- i/lib/regcomp.c -+++ w/lib/regcomp.c -@@ -523,8 +523,8 @@ weak_alias (__regcomp, regcomp) - from either regcomp or regexec. We don't use PREG here. */ - - size_t --regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf, -- size_t errbuf_size) -+regerror (int errcode, const regex_t *__restrict preg _UNUSED_PARAMETER_, -+ char *__restrict errbuf, size_t errbuf_size) - { - const char *msg; - size_t msg_size; -@@ -1407,7 +1407,7 @@ calc_first (void *extra, bin_tree_t *node) - - /* Pass 2: compute NEXT on the tree. Preorder visit. */ - static reg_errcode_t --calc_next (void *extra, bin_tree_t *node) -+calc_next (void *extra _UNUSED_PARAMETER_, bin_tree_t *node) - { - switch (node->token.type) - { -@@ -2821,8 +2821,10 @@ build_range_exp (const reg_syntax_t syntax, - static reg_errcode_t - internal_function - # ifdef RE_ENABLE_I18N --build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, -- Idx *coll_sym_alloc, const unsigned char *name) -+build_collating_symbol (bitset_t sbcset, -+ re_charset_t *mbcset _UNUSED_PARAMETER_, -+ Idx *coll_sym_alloc _UNUSED_PARAMETER_, -+ const unsigned char *name) - # else /* not RE_ENABLE_I18N */ - build_collating_symbol (bitset_t sbcset, const unsigned char *name) - # endif /* not RE_ENABLE_I18N */ -@@ -3392,7 +3394,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - - static reg_errcode_t - parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp, -- re_token_t *token, int token_len, re_dfa_t *dfa, -+ re_token_t *token, int token_len, -+ re_dfa_t *dfa _UNUSED_PARAMETER_, - reg_syntax_t syntax, bool accept_hyphen) - { - #ifdef RE_ENABLE_I18N -@@ -3479,8 +3482,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, - - static reg_errcode_t - #ifdef RE_ENABLE_I18N --build_equiv_class (bitset_t sbcset, re_charset_t *mbcset, -- Idx *equiv_class_alloc, const unsigned char *name) -+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset _UNUSED_PARAMETER_, -+ Idx *equiv_class_alloc _UNUSED_PARAMETER_, -+ const unsigned char *name) - #else /* not RE_ENABLE_I18N */ - build_equiv_class (bitset_t sbcset, const unsigned char *name) - #endif /* not RE_ENABLE_I18N */ -@@ -3884,7 +3888,7 @@ free_token (re_token_t *node) - and its children. */ - - static reg_errcode_t --free_tree (void *extra, bin_tree_t *node) -+free_tree (void *extra _UNUSED_PARAMETER_, bin_tree_t *node) - { - free_token (&node->token); - return REG_NOERROR; |