From: Eric Blake <eblake@redhat.com>
Date: Wed, 18 May 2011 19:13:03 +0000 (-0600)
Subject: fnmatch: avoid compiler warning
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c4be75eb0966bde4533bc111778e0ab494a93be;p=pspp

fnmatch: avoid compiler warning

Detected on Ubuntu 10.04, where the glibc fnmatch fix is not yet
present; also reproduced via:
$ gl_cv_func_fnmatch_posix=no CFLAGS=-Wall \
    ./gnulib-tool --with-tests --test fnmatch

In file included from gllib/fnmatch.c:172:0:
gllib/fnmatch_loop.c: In function ‘internal_fnmatch’:
gllib/fnmatch_loop.c:203:28: error: initialization discards qualifiers from pointer target type
gllib/fnmatch_loop.c:204:28: error: initialization discards qualifiers from pointer target type

* lib/fnmatch_loop.c (FCT): Use correct type.
Reported by Matthias Bolte.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index ffea4737db..99e2c3e702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-18  Eric Blake  <eblake@redhat.com>
+
+	fnmatch: avoid compiler warning
+	* lib/fnmatch_loop.c (FCT): Use correct type.
+	Reported by Matthias Bolte.
+
 2011-05-13  Jim Meyering  <meyering@redhat.com>
 
 	maint.mk: three new prohibit_<HDR>_without_use rules
diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index 1fb246f0a2..8334491d40 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -200,8 +200,8 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
         case L_('['):
           {
             /* Nonzero if the sense of the character class is inverted.  */
-            CHAR *p_init = p;
-            CHAR *n_init = n;
+            const CHAR *p_init = p;
+            const CHAR *n_init = n;
             register bool not;
             CHAR cold;
             UCHAR fn;