re-indentation, bug fixes, hooks for pre-emptive async cancelation

1 files changed, 78 insertions, 78 deletions

diff --git a/pthread_rwlock_wrlock.c b/pthread_rwlock_wrlock.c
index 3c0eed7..384c779 100644
--- a/pthread_rwlock_wrlock.c
+++ b/pthread_rwlock_wrlock.c
@@ -41,94 +41,94 @@
 #include "implement.h"
 
 int
-pthread_rwlock_wrlock(pthread_rwlock_t * rwlock)
+pthread_rwlock_wrlock (pthread_rwlock_t * rwlock)
 {
-    int result;
-    pthread_rwlock_t rwl;
-
-    if (rwlock == NULL || *rwlock == NULL)
-      {
-	return EINVAL;
-      }
-
-    /*
-     * We do a quick check to see if we need to do more work
-     * to initialise a static rwlock. We check
-     * again inside the guarded section of ptw32_rwlock_check_need_init()
-     * to avoid race conditions.
-     */
-    if (*rwlock == PTHREAD_RWLOCK_INITIALIZER)
-      {
-	result = ptw32_rwlock_check_need_init(rwlock);
-
-	if (result != 0 && result != EBUSY)
-	  {
-	    return result;
-	  }
-      }
-
-    rwl = *rwlock;
-
-    if (rwl->nMagic != PTW32_RWLOCK_MAGIC)
-      {
-	return EINVAL;
-      }
-
-    if ((result = pthread_mutex_lock(&(rwl->mtxExclusiveAccess))) != 0)
-      {
-	return result;
-      }
-
-    if ((result = pthread_mutex_lock(&(rwl->mtxSharedAccessCompleted))) != 0)
-      {
-	(void) pthread_mutex_unlock(&(rwl->mtxExclusiveAccess));
-	return result;
-      }
-
-    if (rwl->nExclusiveAccessCount == 0) 
-      {
-	if (rwl->nCompletedSharedAccessCount > 0) 
-	  {
-	    rwl->nSharedAccessCount -= rwl->nCompletedSharedAccessCount;
-	    rwl->nCompletedSharedAccessCount = 0;
-	  }
-
-	if (rwl->nSharedAccessCount > 0) 
-	  {
-	    rwl->nCompletedSharedAccessCount = -rwl->nSharedAccessCount;
-
-	    /*
-	     * This routine may be a cancelation point
-	     * according to POSIX 1003.1j section 18.1.2.
-	     */
+  int result;
+  pthread_rwlock_t rwl;
+
+  if (rwlock == NULL || *rwlock == NULL)
+    {
+      return EINVAL;
+    }
+
+  /*
+   * We do a quick check to see if we need to do more work
+   * to initialise a static rwlock. We check
+   * again inside the guarded section of ptw32_rwlock_check_need_init()
+   * to avoid race conditions.
+   */
+  if (*rwlock == PTHREAD_RWLOCK_INITIALIZER)
+    {
+      result = ptw32_rwlock_check_need_init (rwlock);
+
+      if (result != 0 && result != EBUSY)
+	{
+	  return result;
+	}
+    }
+
+  rwl = *rwlock;
+
+  if (rwl->nMagic != PTW32_RWLOCK_MAGIC)
+    {
+      return EINVAL;
+    }
+
+  if ((result = pthread_mutex_lock (&(rwl->mtxExclusiveAccess))) != 0)
+    {
+      return result;
+    }
+
+  if ((result = pthread_mutex_lock (&(rwl->mtxSharedAccessCompleted))) != 0)
+    {
+      (void) pthread_mutex_unlock (&(rwl->mtxExclusiveAccess));
+      return result;
+    }
+
+  if (rwl->nExclusiveAccessCount == 0)
+    {
+      if (rwl->nCompletedSharedAccessCount > 0)
+	{
+	  rwl->nSharedAccessCount -= rwl->nCompletedSharedAccessCount;
+	  rwl->nCompletedSharedAccessCount = 0;
+	}
+
+      if (rwl->nSharedAccessCount > 0)
+	{
+	  rwl->nCompletedSharedAccessCount = -rwl->nSharedAccessCount;
+
+	  /*
+	   * This routine may be a cancelation point
+	   * according to POSIX 1003.1j section 18.1.2.
+	   */
 #ifdef _MSC_VER
 #pragma inline_depth(0)
 #endif
-	    pthread_cleanup_push(ptw32_rwlock_cancelwrwait, (void*)rwl);
+	  pthread_cleanup_push (ptw32_rwlock_cancelwrwait, (void *) rwl);
 
-	    do
-	      {
-		result = pthread_cond_wait(&(rwl->cndSharedAccessCompleted),
-					   &(rwl->mtxSharedAccessCompleted));
-	      }
-	    while (result == 0 && rwl->nCompletedSharedAccessCount < 0);
+	  do
+	    {
+	      result = pthread_cond_wait (&(rwl->cndSharedAccessCompleted),
+					  &(rwl->mtxSharedAccessCompleted));
+	    }
+	  while (result == 0 && rwl->nCompletedSharedAccessCount < 0);
 
-	    pthread_cleanup_pop ((result != 0) ? 1 : 0);
+	  pthread_cleanup_pop ((result != 0) ? 1 : 0);
 #ifdef _MSC_VER
 #pragma inline_depth()
 #endif
 
-	    if (result == 0)
-	      {
-		rwl->nSharedAccessCount = 0;
-	      }
-	  }
-      }
+	  if (result == 0)
+	    {
+	      rwl->nSharedAccessCount = 0;
+	    }
+	}
+    }
 
-    if (result == 0)
-      {
-	rwl->nExclusiveAccessCount++;
-      }
+  if (result == 0)
+    {
+      rwl->nExclusiveAccessCount++;
+    }
 
-    return result;
+  return result;
 }