From ee5d5755a826eb7b48bdf020bef397a33868780b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 29 May 2007 16:15:48 +0000 Subject: * 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. --- nscd/nscd_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nscd') diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c index bab4913..79644a4 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) -- cgit v1.1