mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-05 12:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
format aren't provided, set both wname and wformat to L"".
This commit is contained in:
Ulrich Drepper 2006-05-11 17:11:16 +00:00
parent 790fc6e41d
commit 3d237e425c
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2006-05-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Only store * sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Only store

15
locale/programs/ld-time.c
View File

@ -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 offset */
wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end start */ wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end start */
wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end end */ wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end end */
time->era_entries[idx].wname = (uint32_t *) wstr + 1;
if (wstr != NULL) if (wstr != NULL)
{ {
time->era_entries[idx].wname = (uint32_t *) wstr + 1;
wstr = wcschr (wstr + 1, L':'); /* end name */ wstr = wcschr (wstr + 1, L':'); /* end name */
*wstr = L'\0'; if (wstr != NULL)
time->era_entries[idx].wformat = (uint32_t *) wstr + 1; {
*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 else
time->era_entries[idx].wformat = NULL; time->era_entries[idx].wname =
time->era_entries[idx].wformat = (uint32_t *) L"";
} }
} }

5
nptl/ChangeLog
View File

@ -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> 2006-05-10 Ulrich Drepper <drepper@redhat.com>
* pthread_atfork.c: Mark __dso_handle as hidden. * pthread_atfork.c: Mark __dso_handle as hidden.

4
nptl/sem_open.c
View File

@ -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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. 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; void *__sem_mappings attribute_hidden;
/* Lock to protect the search tree. */ /* 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. */ /* Search for existing mapping and if possible add the one provided. */

4
nptl/semaphoreP.h
View File

@ -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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. 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; extern void *__sem_mappings attribute_hidden;
/* Lock to protect the search tree. */ /* 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. */ /* Initializer for mountpoint. */