Update.

2004-06-28  Jakub Jelinek  <jakub@redhat.com>

	* 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 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-28  Jakub Jelinek  <jakub@redhat.com>
+
+       * 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  <jakub@redhat.com>
 
        * 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 (file)
--- 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 <schwidefsky@de.ibm.com>, 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 (file)
--- 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 <schwidefsky@de.ibm.com>, 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;