diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-02-03 03:15:10 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-02-03 10:18:28 +0000 |
| commit | 658529a10e05d06524d5f591a08f04c04159b4cc (patch) | |
| tree | 012a365fb870240694613f6a501ccf34b4080f49 /gl/lib/regcomp.c.diff | |
| parent | bfb4f5c8b791fdcc3cdba87a5182fc684fa8cd24 (diff) | |
| download | coreutils-658529a10e05d06524d5f591a08f04c04159b4cc.tar.xz | |
build: fix invalid gnulib patch
* gl/lib/tempname.c.diff: Fix recent breakage so it applies again.
Invalid patch was noticed at http://hydra.nixos.org/eval/1172233
* cfg.mk: Exempt diff files from these "id_est" syntax checks.
(sc_ensure_gl_diffs_apply): A new syntax check, to ensure all
patches under gl/ apply cleanly. Note we use --fuzz=0 to check
patches apply cleanly for safety, due to the patch(1) issue detailed
in commit v8.21-117-g46f7e05
* gl/lib/regcomp.c.diff: Rediffed.
* gl/lib/regex_internal.c.diff: Likewise.
* gl/lib/regex_internal.h.diff: Likewise.
* gl/lib/regexec.c.diff: Likewise.
* gl/lib/tempname.h.diff: Likewise.
Diffstat (limited to 'gl/lib/regcomp.c.diff')
| -rw-r--r-- | gl/lib/regcomp.c.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff index 9042a6e47..cc6649f2e 100644 --- a/gl/lib/regcomp.c.diff +++ b/gl/lib/regcomp.c.diff @@ -1,8 +1,8 @@ diff --git a/lib/regcomp.c b/lib/regcomp.c -index 6d5525a..c9331d4 100644 +index 840220f..192632c 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c -@@ -539,7 +539,7 @@ regerror (errcode, preg, errbuf, errbuf_size) +@@ -540,7 +540,7 @@ regerror (errcode, preg, errbuf, errbuf_size) size_t errbuf_size; #else /* size_t might promote */ size_t @@ -11,7 +11,7 @@ index 6d5525a..c9331d4 100644 char *_Restrict_ errbuf, size_t errbuf_size) #endif { -@@ -1421,7 +1421,7 @@ calc_first (void *extra, bin_tree_t *node) +@@ -1427,7 +1427,7 @@ calc_first (void *extra, bin_tree_t *node) /* Pass 2: compute NEXT on the tree. Preorder visit. */ static reg_errcode_t @@ -20,7 +20,7 @@ index 6d5525a..c9331d4 100644 { switch (node->token.type) { -@@ -2807,8 +2807,10 @@ build_range_exp (const reg_syntax_t syntax, +@@ -2820,8 +2820,10 @@ build_range_exp (const reg_syntax_t syntax, static reg_errcode_t internal_function # ifdef RE_ENABLE_I18N @@ -33,7 +33,7 @@ index 6d5525a..c9331d4 100644 # 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, +@@ -3389,7 +3391,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, @@ -43,7 +43,7 @@ index 6d5525a..c9331d4 100644 reg_syntax_t syntax, bool accept_hyphen) { #ifdef RE_ENABLE_I18N -@@ -3479,8 +3482,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, +@@ -3476,8 +3479,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, static reg_errcode_t #ifdef RE_ENABLE_I18N @@ -56,7 +56,7 @@ index 6d5525a..c9331d4 100644 #else /* not RE_ENABLE_I18N */ build_equiv_class (bitset_t sbcset, const unsigned char *name) #endif /* not RE_ENABLE_I18N */ -@@ -3886,7 +3891,7 @@ free_token (re_token_t *node) +@@ -3883,7 +3888,7 @@ free_token (re_token_t *node) and its children. */ static reg_errcode_t |