2009-11-09 Robert Millan <rmh.grub@aybabtu.com>

        * gnulib/fnmatch_loop.c (EXT): Fix warning (signed and unsigned type in
        conditional expression).

diff --git a/ChangeLog b/ChangeLog
index fa049319030d49a88346822488972176028bc9c8..2d7a088ea363a738c326fcc7c2835bb8bcdd0a1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * gnulib/fnmatch_loop.c (EXT): Fix warning (signed and unsigned type in
+       conditional expression).
+
 2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
 
        Import from Gnulib.

diff --git a/gnulib/fnmatch_loop.c b/gnulib/fnmatch_loop.c
index d1008c247df2a8553bd9ee5f663c86aa76d7b58d..c2182ffb0dfca60821294ce5bde8bbac32c127ad 100644 (file)
--- a/gnulib/fnmatch_loop.c
+++ b/gnulib/fnmatch_loop.c
@@ -1069,9 +1069,10 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
            size_t plensize;                                                  \
            size_t newpsize;                                                  \
                                                                              \
+           assert (p > startp);                                              \
            plen = (opt == L_('?') || opt == L_('@')                          \
                    ? pattern_len                                             \
-                   : p - startp + 1);                                        \
+                   : (unsigned) (p - startp) + 1);                           \
            plensize = plen * sizeof (CHAR);                                  \
            newpsize = offsetof (struct patternlist, str) + plensize;         \
            if ((size_t) -1 / sizeof (CHAR) < plen                            \