From: Ulrich Drepper Date: Mon, 28 Jun 2004 19:38:25 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/fedora-base~372 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3a1975474102f51d4276fb1bde7e48dadab0757;p=platform%2Fupstream%2Fglibc.git Update. 2004-06-28 Jakub Jelinek * sysdeps/pthread/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Return EINVAL if tv_nsec is negative, instead of tv_sec. * sysdeps/pthread/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. --- diff --git a/nptl/ChangeLog b/nptl/ChangeLog index e1df427..275d1a7 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +2004-06-28 Jakub Jelinek + + * sysdeps/pthread/pthread_rwlock_timedwrlock.c + (pthread_rwlock_timedwrlock): Return EINVAL if tv_nsec is negative, + instead of tv_sec. + * sysdeps/pthread/pthread_rwlock_timedrdlock.c + (pthread_rwlock_timedrdlock): Likewise. + 2004-06-22 Jakub Jelinek * sysdeps/unix/sysv/linux/s390/lowlevellock.h (lll_futex_requeue): diff --git a/nptl/sysdeps/pthread/pthread_rwlock_timedrdlock.c b/nptl/sysdeps/pthread/pthread_rwlock_timedrdlock.c index 85cc176..62f3e23 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_timedrdlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_timedrdlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky , 2003. @@ -71,7 +71,7 @@ pthread_rwlock_timedrdlock (rwlock, abstime) to the front is no option. Replicating all the code is costly while this test is not. */ if (__builtin_expect (abstime->tv_nsec >= 1000000000 - || abstime->tv_sec < 0, 0)) + || abstime->tv_nsec < 0, 0)) { result = EINVAL; break; diff --git a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c index dd5f9b4..97c0598 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky , 2003. @@ -62,7 +62,7 @@ pthread_rwlock_timedwrlock (rwlock, abstime) to the front is no option. Replicating all the code is costly while this test is not. */ if (__builtin_expect (abstime->tv_nsec >= 1000000000 - || abstime->tv_sec < 0, 0)) + || abstime->tv_nsec < 0, 0)) { result = EINVAL; break;