Use appropriate type for return value checking

diff --git a/ChangeLog b/ChangeLog
index 0905fef..10428ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-09  Ulrich Drepper  <drepper@gmail.com>
 
+       [BZ #12545]
+       * locale/programs/localedef.c (construct_output_path): Use ssize_t
+       for n.
+
        [BZ #12711]
        * locale/C-translit.h.in: Add entry for U20B9.
        Patch by pravin.d.s@gmail.com.

diff --git a/NEWS b/NEWS
index 42cdebe..58cd18a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,9 +10,9 @@ Version 2.14
 * The following bugs are resolved with this release:
 
   11724, 12393, 12420, 12445, 12454, 12460, 12469, 12489, 12509, 12510,
-  12518, 12541, 12551, 12583, 12587, 12597, 12611, 12631, 12650, 12653,
-  12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717, 12723, 12734,
-  12738
+  12518, 12541, 12545, 12551, 12583, 12587, 12597, 12611, 12631, 12650,
+  12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717, 12723,
+  12734, 12738
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 61f9bef..2f100f7 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -417,7 +417,6 @@ construct_output_path (char *path)
         contains a reference to the codeset.  This should be
         normalized.  */
       char *startp;
-      size_t n;
 
       startp = path;
       /* We must be prepared for finding a CEN name or a location of
@@ -441,6 +440,7 @@ construct_output_path (char *path)
       /* We put an additional '\0' at the end of the string because at
         the end of the function we need another byte for the trailing
         '/'.  */
+      ssize_t n;
       if (normal == NULL)
        n = asprintf (&result, "%s%s/%s%c",
                      output_prefix ?: "", LOCALEDIR, path, '\0');