public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Fix tst-rwlock14 on !i386 !x86_64
@ 2004-06-28 19:13 Jakub Jelinek
  2004-06-28 19:38 ` Ulrich Drepper
  0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2004-06-28 19:13 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: Glibc hackers

Hi!

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.

--- libc/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c.jj	2004-06-28 21:06:11.000000000 +0200
+++ libc/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c	2004-06-28 21:10:04.127935596 +0200
@@ -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, abst
 	 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;
--- libc/nptl/sysdeps/pthread/pthread_rwlock_timedrdlock.c.jj	2004-06-28 21:07:17.000000000 +0200
+++ libc/nptl/sysdeps/pthread/pthread_rwlock_timedrdlock.c	2004-06-28 21:10:09.526980957 +0200
@@ -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, abst
 	 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;

	Jakub

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Fix tst-rwlock14 on !i386 !x86_64
  2004-06-28 19:13 [PATCH] Fix tst-rwlock14 on !i386 !x86_64 Jakub Jelinek
@ 2004-06-28 19:38 ` Ulrich Drepper
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2004-06-28 19:38 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: Glibc hackers

Applied.

-- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-06-28 19:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-06-28 19:13 [PATCH] Fix tst-rwlock14 on !i386 !x86_64 Jakub Jelinek
2004-06-28 19:38 ` Ulrich Drepper

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).