summary refs log tree commit diff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-05-29 16:15:48 +0000
committerUlrich Drepper <drepper@redhat.com>2007-05-29 16:15:48 +0000
commitee5d5755a826eb7b48bdf020bef397a33868780b (patch)
tree54bfdd1a4b47b26d97b3dada3c78d729405718ac /nscd
parent5da4373cfd0bf070ec3ece378c4dea9b027c0ce2 (diff)
downloadglibc-ee5d5755a826eb7b48bdf020bef397a33868780b.tar.gz
glibc-ee5d5755a826eb7b48bdf020bef397a33868780b.tar.xz
glibc-ee5d5755a826eb7b48bdf020bef397a33868780b.zip
* sysdeps/unix/sysv/linux/internaltypes.h: Introduce
	COND_NWAITERS_SHIFT.
	* pthread_cond_destroy.c: Use COND_NWAITERS_SHIFT instead of
	COND_CLOCK_BITS.
	* pthread_cond_init.c: Likewise.
	* pthread_cond_timedwait.c: Likewise.
	* pthread_cond_wait.c: Likewise.
	* pthread_condattr_getclock.c: Likewise.
	* pthread_condattr_setclock.c: Likewise.
	* sysdeps/unix/sysv/linux/lowlevelcond.sym: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/nscd_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index bab4913e9a..79644a4da1 100644
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -269,13 +269,13 @@ get_mapping (request_type type, const char *key,
 			!= keylen, 0))
     goto out_close2;
 
-  mapfd = *(int *) CMSG_DATA (cmsg);
-
   if (__builtin_expect (CMSG_FIRSTHDR (&msg) == NULL
 			|| (CMSG_FIRSTHDR (&msg)->cmsg_len
 			    != CMSG_LEN (sizeof (int))), 0))
     goto out_close2;
 
+  mapfd = *(int *) CMSG_DATA (cmsg);
+
   struct stat64 st;
   if (__builtin_expect (strcmp (resdata, key) != 0, 0)
       || __builtin_expect (fstat64 (mapfd, &st) != 0, 0)