commit 7bd0815371c9bd803ee4ca0981b911b99efd2454
author Elliott Hughes <enh@google.com> Wed Dec 11 23:46:05 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 23:46:05 2013 +0000
tree 854bf99a06ea89a29e8eee49d0c5cc361e30531c
parent 73ef27cd0de0c6b7d4f6bc9c2250dbae3f0a88c3
parent dff7203ee99ccac446b9a1c4371753a5216c6db4

Merge "Remove harmful attempts to be helpful in pthread_mutex functions."

libc/bionic/pthread_mutex.cpp

diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
index 1010f11..8eaf95f 100644
--- a/libc/bionic/pthread_mutex.cpp
+++ b/libc/bionic/pthread_mutex.cpp
@@ -282,21 +282,16 @@
     return 0;
 }
 
-int pthread_mutex_init(pthread_mutex_t *mutex,
-                       const pthread_mutexattr_t *attr)
-{
-    int value = 0;
-
-    if (mutex == NULL)
-        return EINVAL;
-
+int pthread_mutex_init(pthread_mutex_t* mutex, const pthread_mutexattr_t* attr) {
     if (__predict_true(attr == NULL)) {
         mutex->value = MUTEX_TYPE_BITS_NORMAL;
         return 0;
     }
 
-    if ((*attr & MUTEXATTR_SHARED_MASK) != 0)
+    int value = 0;
+    if ((*attr & MUTEXATTR_SHARED_MASK) != 0) {
         value |= MUTEX_SHARED_MASK;
+    }
 
     switch (*attr & MUTEXATTR_TYPE_MASK) {
     case PTHREAD_MUTEX_NORMAL:
@@ -473,9 +468,6 @@
 {
     int mvalue, mtype, tid, shared;
 
-    if (__predict_false(mutex == NULL))
-        return EINVAL;
-
     mvalue = mutex->value;
     mtype = (mvalue & MUTEX_TYPE_MASK);
     shared = (mvalue & MUTEX_SHARED_MASK);
@@ -565,9 +557,6 @@
 {
     int mvalue, mtype, tid, shared;
 
-    if (__predict_false(mutex == NULL))
-        return EINVAL;
-
     mvalue = mutex->value;
     mtype  = (mvalue & MUTEX_TYPE_MASK);
     shared = (mvalue & MUTEX_SHARED_MASK);
@@ -630,9 +619,6 @@
 {
     int mvalue, mtype, tid, shared;
 
-    if (__predict_false(mutex == NULL))
-        return EINVAL;
-
     mvalue = mutex->value;
     mtype  = (mvalue & MUTEX_TYPE_MASK);
     shared = (mvalue & MUTEX_SHARED_MASK);
@@ -705,9 +691,6 @@
     /* compute absolute expiration time */
     __timespec_to_relative_msec(&abstime, msecs, clock);
 
-    if (__predict_false(mutex == NULL))
-        return EINVAL;
-
     mvalue = mutex->value;
     mtype  = (mvalue & MUTEX_TYPE_MASK);
     shared = (mvalue & MUTEX_SHARED_MASK);