* locale/programs/ld-time.c (time_finish): If wide era name or

	format aren't provided, set both wname and wformat to L"".

diff --git a/ChangeLog b/ChangeLog
index 92259aa5b475931882b0c0a4a25af69b64f16c4d..6854e56c8384be7c7b58b62bf5a550cb41052fbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+       * locale/programs/ld-time.c (time_finish): If wide era name or
+       format aren't provided, set both wname and wformat to L"".
+
 2006-05-10  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Only store

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 78aff7fee6142bdfce43d66735d14b9407a66018..4f1dcb0ce73e2f42b7c312d19abbf964f7fafcc4 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -467,15 +467,22 @@ No definition for %s category found"), "LC_TIME"));
          wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end offset */
          wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end start */
          wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end end */
-         time->era_entries[idx].wname = (uint32_t *) wstr + 1;
          if (wstr != NULL)
            {
+             time->era_entries[idx].wname = (uint32_t *) wstr + 1;
              wstr = wcschr (wstr + 1, L':');   /* end name */
-             *wstr = L'\0';
-             time->era_entries[idx].wformat = (uint32_t *) wstr + 1;
+             if (wstr != NULL)
+               {
+                 *wstr = L'\0';
+                 time->era_entries[idx].wformat = (uint32_t *) wstr + 1;
+               }
+             else
+               time->era_entries[idx].wname =
+                 time->era_entries[idx].wformat = (uint32_t *) L"";
            }
          else
-           time->era_entries[idx].wformat = NULL;
+           time->era_entries[idx].wname =
+             time->era_entries[idx].wformat = (uint32_t *) L"";
        }
     }
 

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 024bc6ecfec8f059c87f4000d8909e61c3cd60db..c5374404e56d0740526dc55eea44874cbc2f4249 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11  Ulrich Drepper  <drepper@redhat.com>
+
+       * sem_open.c (__sem_mappings_lock): Mark as hidden.
+       * semaphoreP.h (__sem_mappings_lock): Likewise.
+
 2006-05-10  Ulrich Drepper  <drepper@redhat.com>
 
        * pthread_atfork.c: Mark __dso_handle as hidden.

diff --git a/nptl/sem_open.c b/nptl/sem_open.c
index a4b2f5b3ac6fdf0931cb5f36b9de4c17ef0681bc..66bcb13aec4339377d60544caf7b95d1b7f1f2b7 100644 (file)
--- a/nptl/sem_open.c
+++ b/nptl/sem_open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -147,7 +147,7 @@ __sem_search (const void *a, const void *b)
 void *__sem_mappings attribute_hidden;
 
 /* Lock to protect the search tree.  */
-lll_lock_t __sem_mappings_lock = LLL_LOCK_INITIALIZER;
+lll_lock_t __sem_mappings_lock attribute_hidden = LLL_LOCK_INITIALIZER;
 
 
 /* Search for existing mapping and if possible add the one provided.  */

diff --git a/nptl/semaphoreP.h b/nptl/semaphoreP.h
index d14ea92c74ad54f5dddcb6f73b9ef1c76a14dac8..754609a1a82fbbe8a2096df7032bdfdaeeae5ffa 100644 (file)
--- a/nptl/semaphoreP.h
+++ b/nptl/semaphoreP.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -48,7 +48,7 @@ extern pthread_once_t __namedsem_once attribute_hidden;
 extern void *__sem_mappings attribute_hidden;
 
 /* Lock to protect the search tree.  */
-extern lll_lock_t __sem_mappings_lock;
+extern lll_lock_t __sem_mappings_lock attribute_hidden;
 
 
 /* Initializer for mountpoint.  */