summaryrefslogtreecommitdiff
path: root/nptl/pthread_setspecific.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-03 09:36:43 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-03 09:36:43 +0000
commit9c06eb66b5b4662c22532ab03525eab46c4cf2eb (patch)
tree7f7e94cb6fe44805bab472b7d839e909c360315e /nptl/pthread_setspecific.c
parenta14219efc11f7f4f0cf6bea92be9e43f91118012 (diff)
downloadglibc-9c06eb66b5b4662c22532ab03525eab46c4cf2eb.tar.gz
[BZ #2908]
* stdio-common/printf_fphex.c (__printf_fphex): When rounding up 'f', use '1' as leading digit not '\1'. * stdio-common/Makefile (tests): Add bug16. * stdio-common/bug16.c: New file. [BZ #2914] * sysdeps/unix/sysv/linux/gethostid.c: Don't define OLD_HOSTIDFILE and don't try to open it. The patch introducing the macro contained a bug and used the same file name as the new file instead of using /var/adm/hostid. Nobody complaint so I'm taking this out completely. [BZ #2926] * assert/assert.h: Move cast to void inside ?: to quiet gcc. Patch by Jerry James <Jerry.James@usu.edu>.
Diffstat (limited to 'nptl/pthread_setspecific.c')
-rw-r--r--nptl/pthread_setspecific.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nptl/pthread_setspecific.c b/nptl/pthread_setspecific.c
index b6e66b5f22..152f5590e2 100644
--- a/nptl/pthread_setspecific.c
+++ b/nptl/pthread_setspecific.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.
@@ -52,8 +52,8 @@ __pthread_setspecific (key, value)
}
else
{
- if (KEY_UNUSED ((seq = __pthread_keys[key].seq))
- || key >= PTHREAD_KEYS_MAX)
+ if (key >= PTHREAD_KEYS_MAX
+ || KEY_UNUSED ((seq = __pthread_keys[key].seq)))
/* Not valid. */
return EINVAL;