summaryrefslogtreecommitdiff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-10-12 16:33:15 +0000
committerUlrich Drepper <drepper@redhat.com>1999-10-12 16:33:15 +0000
commitd4c5cf8060af2e6b6c38989b43f32a613b718d22 (patch)
tree710e31383b1f589ac384066bb9f8ddd2127d392d /locale/setlocale.c
parent39d1d4e5cae89fc2c401a6a65ef47444a76c0a40 (diff)
downloadglibc-d4c5cf8060af2e6b6c38989b43f32a613b718d22.tar.gz
Update.
1999-10-12 Ulrich Drepper <drepper@cygnus.com> * locale/setlocale.c: Fix gcc warning about uninitialized variable.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index f053895573..c0f453cd94 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -327,12 +327,9 @@ setlocale (int category, const char *locale)
}
/* Create new composite name. */
- if (category >= 0
- || (composite = new_composite_name (LC_ALL, newnames)) == NULL)
- /* Loading this part of the locale failed. Abort the
- composite load. */
- composite = NULL;
- else
+ composite = (category >= 0
+ ? NULL : new_composite_name (LC_ALL, newnames));
+ if (composite != NULL)
{
/* Now we have loaded all the new data. Put it in place. */
for (category = 0; category < __LC_LAST; ++category)