From: Bruno Haible Date: Thu, 18 May 2017 21:19:32 +0000 (+0200) Subject: Update after gnulib changed. X-Git-Tag: v0.20~463 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=567d12d3b1e354d8093eee2b68aaa4e29e7aec51;p=thirdparty%2Fgettext.git Update after gnulib changed. * gnulib-local/lib/fnmatch_loop.c.diff: Update. --- diff --git a/gnulib-local/lib/fnmatch_loop.c.diff b/gnulib-local/lib/fnmatch_loop.c.diff index 85c299f3d..3224f9316 100644 --- a/gnulib-local/lib/fnmatch_loop.c.diff +++ b/gnulib-local/lib/fnmatch_loop.c.diff @@ -102,20 +102,19 @@ *lastp = newp; \ lastp = &newp->next *************** -*** 1103,1114 **** +*** 1103,1113 **** { case L_('*'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) ! return 0; - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('+'): do { for (rs = string; rs <= string_end; ++rs) /* First match the prefix with the current pattern with the current pattern. */ ---- 1119,1135 ---- +--- 1119,1134 ---- { case L_('*'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) @@ -123,8 +122,7 @@ ! retval = 0; ! goto done; ! } - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('+'): do { @@ -134,7 +132,7 @@ /* First match the prefix with the current pattern with the current pattern. */ *************** -*** 1130,1160 **** +*** 1130,1159 **** : rs[-1] == '/' && NO_LEADING_PERIOD (flags), flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0))) @@ -149,8 +147,7 @@ case L_('?'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) ! return 0; - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('@'): do ! /* I cannot believe it but 'strcat' is actually acceptable @@ -166,7 +163,7 @@ /* None of the patterns lead to a match. */ return FNM_NOMATCH; ---- 1151,1204 ---- +--- 1151,1203 ---- : rs[-1] == '/' && NO_LEADING_PERIOD (flags), flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0))) @@ -192,8 +189,7 @@ ! retval = 0; ! goto done; ! } - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('@'): do ! {