fnmatch: avoid compiler warning

cond ? (size_t) : (char* - char* + 1) varies in signedness, but
using 1LU coerces the latter half to unsigned math.

* lib/fnmatch_loop.c (NEW_PATTERN): Coerce addition to unsigned,
to silence compiler warning about mismatch signedness in ?:.
Reported by Robert Millan.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 4ff76e75bd71b7e257c8d5b87467c9381d3585c4..a241c5b12d8e8f0eea4b071f1ac59e74190c145d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-14  Eric Blake  <ebb9@byu.net>
 
+       fnmatch: avoid compiler warning
+       * lib/fnmatch_loop.c (NEW_PATTERN): Coerce addition to unsigned,
+       to silence compiler warning about mismatch signedness in ?:.
+       Reported by Robert Millan.
+
        intprops: add double-inclusion guard
        * lib/intprops.h: Allow idempotent includes.
        Suggested by Bruce Korb.

diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index d1008c247df2a8553bd9ee5f663c86aa76d7b58d..ad58bb26650e4b4b332a8a8eed9a0cab7dbb2812 100644 (file)
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
+/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -1071,7 +1071,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
                                                                              \
            plen = (opt == L_('?') || opt == L_('@')                          \
                    ? pattern_len                                             \
-                   : p - startp + 1);                                        \
+                   : p - startp + 1UL);                                      \
            plensize = plen * sizeof (CHAR);                                  \
            newpsize = offsetof (struct patternlist, str) + plensize;         \
            if ((size_t) -1 / sizeof (CHAR) < plen                            \