From d4c5cf8060af2e6b6c38989b43f32a613b718d22 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 12 Oct 1999 16:33:15 +0000 Subject: [PATCH] Update. 1999-10-12 Ulrich Drepper * locale/setlocale.c: Fix gcc warning about uninitialized variable. --- ChangeLog | 4 ++++ linuxthreads/ChangeLog | 4 ++++ linuxthreads_db/ChangeLog | 6 ++++++ locale/setlocale.c | 9 +++------ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbf244da7e..64c5235963 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1999-10-12 Ulrich Drepper + + * locale/setlocale.c: Fix gcc warning about uninitialized variable. + 1999-10-12 Andreas Jaeger * stdlib/tst-environ.c: Include for strcpy declaration. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 1643612eae..e90c2fea4e 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +1999-10-12 Ulrich Drepper + + * internals.h: Correct return types for __libc_read and __libc_write. + 1999-10-09 Andreas Jaeger * internals.h: Add __new_sem_post to get prototype in diff --git a/linuxthreads_db/ChangeLog b/linuxthreads_db/ChangeLog index 220f021461..6c952c1be0 100644 --- a/linuxthreads_db/ChangeLog +++ b/linuxthreads_db/ChangeLog @@ -1,3 +1,9 @@ +1999-10-12 Andreas Jaeger + + * thread_dbP.h: Include for strlen declaration. Remove + __libc_write prototype since this is already declared in + linuxthreads/internals.h. + 1999-10-11 Ulrich Drepper * thread_db.h: Fix comment for ti_type. 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)