about summary refs log tree commit diff
path: root/nptl/pthread_mutex_trylock.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-23 23:49:41 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-23 23:49:41 +0000
commitdcc73a8ddac3311936c9737f8ebbf2f448bc1f8f (patch)
tree0899785a64542b68ec688426feae299856de9000 /nptl/pthread_mutex_trylock.c
parent9256e5794fea8a5e0fd60f141a74df9056c4719d (diff)
downloadglibc-dcc73a8ddac3311936c9737f8ebbf2f448bc1f8f.tar.gz
glibc-dcc73a8ddac3311936c9737f8ebbf2f448bc1f8f.tar.xz
glibc-dcc73a8ddac3311936c9737f8ebbf2f448bc1f8f.zip
* pthread_mutex_destroy.c: Set mutex type to an invalid value.
	* pthread_mutex_lock.c: Return EINVAL for invalid mutex type.
	* pthread_mutex_trylock.c: Likewise.
	* pthread_mutex_timedlock.c: Likewise.
	* pthread_mutex_unlock.c: Likewise.
Diffstat (limited to 'nptl/pthread_mutex_trylock.c')
-rw-r--r--nptl/pthread_mutex_trylock.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
index 7008af3d97..a50b9173ac 100644
--- a/nptl/pthread_mutex_trylock.c
+++ b/nptl/pthread_mutex_trylock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -57,8 +57,6 @@ __pthread_mutex_trylock (mutex)
 
     case PTHREAD_MUTEX_ERRORCHECK_NP:
       /* Error checking mutex.  We do not check for deadlocks.  */
-    default:
-      /* Correct code cannot set any other type.  */
     case PTHREAD_MUTEX_TIMED_NP:
     case PTHREAD_MUTEX_ADAPTIVE_NP:
       /* Normal mutex.  */
@@ -70,6 +68,10 @@ __pthread_mutex_trylock (mutex)
 
 	  return 0;
 	}
+
+    default:
+      /* Correct code cannot set any other type.  */
+      return EINVAL;
     }
 
   return EBUSY;