From c18b3699e1b8c4ad2739761f2b9c306ff2303322 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 14 Mar 2016 08:59:56 -0700 Subject: 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. --- gl/lib/regexec.c.diff | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 gl/lib/regexec.c.diff (limited to 'gl/lib/regexec.c.diff') diff --git a/gl/lib/regexec.c.diff b/gl/lib/regexec.c.diff deleted file mode 100644 index 1aa3c2477..000000000 --- a/gl/lib/regexec.c.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/lib/regexec.c b/lib/regexec.c -index d3920c4..a8152b5 100644 ---- a/lib/regexec.c -+++ b/lib/regexec.c -@@ -17,6 +17,8 @@ - License along with the GNU C Library; if not, see - . */ - -+#include "verify.h" -+#include "intprops.h" - static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - Idx n) internal_function; - static void match_ctx_clean (re_match_context_t *mctx) internal_function; -@@ -373,8 +375,11 @@ re_search_2_stub (struct re_pattern_buffer *bufp, - Idx len = length1 + length2; - char *s = NULL; - -- if (BE (length1 < 0 || length2 < 0 || stop < 0 || len < length1, 0)) -- return -2; -+ verify (! TYPE_SIGNED (Idx)); -+ if (BE (len < length1, 0)) -+ return -2; -+ /* if (BE (length1 < 0 || length2 < 0 || stop < 0, 0)) -+ return -2; */ - - /* Concatenate the strings. */ - if (length2 > 0) -@@ -423,11 +428,14 @@ re_search_stub (struct re_pattern_buffer *bufp, - Idx last_start = start + range; - - /* Check for out-of-range. */ -- if (BE (start < 0 || start > length, 0)) -- return -1; -+ verify (! TYPE_SIGNED (Idx)); -+ /* if (BE (start < 0, 0)) -+ return -1; */ -+ if (BE (start > length, 0)) -+ return -1; - if (BE (length < last_start || (0 <= range && last_start < start), 0)) - last_start = length; -- else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0)) -+ else if (BE (/* last_start < 0 || */ (range < 0 && start <= last_start), 0)) - last_start = 0; - - lock_lock (dfa->lock); -- cgit v1.2.3-54-g00ecf