aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-09 13:15:01 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-09 13:15:01 -0400
commit2952b11705faf16e8dae432e0a9bbf99e34d4c67 (patch)
tree600bc830e90ac505370dd75d039b6b9cc03bfd25
parent6a564b67fcb72bc5b6d5869bc9c2d575d44eee1a (diff)
downloadglibc-2952b11705faf16e8dae432e0a9bbf99e34d4c67.zip
glibc-2952b11705faf16e8dae432e0a9bbf99e34d4c67.tar.gz
glibc-2952b11705faf16e8dae432e0a9bbf99e34d4c67.tar.bz2
Use appropriate type for return value checking
-rw-r--r--ChangeLog4
-rw-r--r--NEWS6
-rw-r--r--locale/programs/localedef.c2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0905fef..10428ef 100644
--- 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
--- 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
--- 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');