Include <gnustep/base/preface.h> first! Fix indentation.

([NSLock +initialize]): Method removed.
([NSLock -init]): Assert return value from objc_mutex_allocate(),
don't just return nil.
([NSConditionLock -initWithCondition:]): Likewise.
([NSRecursiveLock -init]): Likewise.
([NSConditionLock +initialize]): Method removed.
([NSRecursiveLock +initialize]): Method removed.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1566 72102866-910b-0410-8b05-ffd578937521

Source/NSLock.m

@@ -1,12 +1,8 @@
-/* 
-   NSLock.m
-
-   Mutual exclusion locking classes
-
+/* Mutual exclusion locking classes
    Copyright (C) 1996 Free Software Foundation, Inc.
 
    Author:  Scott Christley <scottc@net-community.com>
-   Date: 1996
+   Created: 1996
    
    This file is part of the GNUstep Objective-C Library.
 
@@ -20,103 +16,77 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   If you are interested in a warranty or support for this source code,
-   contact Scott Christley <scottc@net-community.com> for more information.
-   
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */ 
 
+#include <gnustep/base/preface.h>
 #include <Foundation/NSLock.h>
 
-//
 // NSLock class
 // Simplest lock for protecting critical sections of code
-//
+
 @implementation NSLock
 
-// Class initialization
-+ (void)initialize
-{
-	if (self == [NSLock class])
-	{
-		// Initial version
-		[self setVersion:1];
-	}
-}
-
-// Default initializer
+// Designated initializer
 - init
 {
   [super init];
   
   // Allocate the mutex from the runtime
   mutex = objc_mutex_allocate();
-	if (!mutex)
-		return nil;
-	else
+  NSAssertParameter (mutex);
   return self;
 }
 
-- (void)dealloc
+- (void) dealloc
 {
   // Ask the runtime to deallocate the mutex
   // If there are outstanding locks then it will block
-	objc_mutex_deallocate(mutex);
-
+  objc_mutex_deallocate (mutex);
   [super dealloc];
 }
 
 // Try to acquire the lock
 // Does not block
-- (BOOL)tryLock
+- (BOOL) tryLock
 {
   // Ask the runtime to acquire a lock on the mutex
-	if (objc_mutex_trylock(mutex) == -1)
+  if (objc_mutex_trylock (mutex) == -1)
     return NO;
   else
     return YES;
 }
 
 // NSLocking protocol
-- (void)lock
+- (void) lock
 {
   // Ask the runtime to acquire a lock on the mutex
   // This will block
-	objc_mutex_lock(mutex);
+  objc_mutex_lock (mutex);
 }
 
 - (void)unlock
 {
   // Ask the runtime to release a lock on the mutex
-	objc_mutex_unlock(mutex);
+  objc_mutex_unlock (mutex);
 }
 
 @end
 
-//
+
 // NSConditionLock
-// Allows locking and unlocking to be based upon a condition
-//
-@implementation NSConditionLock
+// Allows locking and unlocking to be based upon an integer condition
 
-// Class initialization
-+ (void)initialize
-{
-	if (self == [NSConditionLock class])
-	{
-		// Initial version
-		[self setVersion:1];
-	}
-}
+@implementation NSConditionLock
 
 - init
 {
-	return [self initWithCondition:0];
+  return [self initWithCondition: 0];
 }
 
-// Default initializer
+// Designated initializer
 // Initialize lock with condition
 - (id)initWithCondition:(int)value
 {
@@ -125,10 +95,8 @@
   condition = value;
 
   // Allocate the mutex from the runtime
-	mutex = objc_mutex_allocate();
-	if (!mutex)
-		return nil;
-	else
+  mutex = objc_mutex_allocate ();
+  NSParameterAssert (mutex);
   return self;
 }
 
@@ -136,8 +104,7 @@
 {
   // Ask the runtime to deallocate the mutex
   // If there are outstanding locks then it will block
-	objc_mutex_deallocate(mutex);
-
+  objc_mutex_deallocate (mutex);
   [super dealloc];
 }
 
@@ -148,7 +115,7 @@
 }
 
 // Acquiring and release the lock
-- (void)lockWhenCondition:(int)value
+- (void) lockWhenCondition: (int)value
 {
   BOOL done;
 
@@ -167,12 +134,12 @@
     }
 }
 
-- (void)unlockWithCondition:(int)value
+- (void) unlockWithCondition: (int)value
 {
   int depth;
 
   // First check to make sure we have the lock
-	depth= objc_mutex_trylock(mutex);
+  depth= objc_mutex_trylock (mutex);
 
   // Another thread has the lock so abort
   if (depth == -1)
@@ -186,11 +153,11 @@
   // This is a valid unlock so set the condition
   // and unlock twice
   condition = value;
-	objc_mutex_unlock(mutex);
-	objc_mutex_unlock(mutex);
+  objc_mutex_unlock (mutex);
+  objc_mutex_unlock (mutex);
 }
 
-- (BOOL)tryLock
+- (BOOL) tryLock
 {
   // Ask the runtime to acquire a lock on the mutex
   if (objc_mutex_trylock(mutex) == -1)
@@ -199,7 +166,7 @@
     return YES;
 }
 
-- (BOOL)tryLockWhenCondition:(int)value
+- (BOOL) tryLockWhenCondition: (int)value
 {
   // First can we even get the lock?
   if (![self tryLock])
@@ -218,86 +185,72 @@
 
 // NSLocking protocol
 // These methods ignore the condition
-- (void)lock
+- (void) lock
 {
   // Ask the runtime to acquire a lock on the mutex
   // This will block
-	objc_mutex_lock(mutex);
+  objc_mutex_lock (mutex);
 }
 
 - (void)unlock
 {
   // Ask the runtime to release a lock on the mutex
-	objc_mutex_unlock(mutex);
+  objc_mutex_unlock (mutex);
 }
 
 @end
 
-//
+
 // NSRecursiveLock
 // Allows the lock to be recursively acquired by the same thread
 //
 // If the same thread locks the mutex (n) times then that same 
 // thread must also unlock it (n) times before another thread 
 // can acquire the lock.
-//
-@implementation NSRecursiveLock
 
-// Class initialization
-+ (void)initialize
-{
-	if (self == [NSRecursiveLock class])
-	{
-		// Initial version
-		[self setVersion:1];
-	}
-}
+@implementation NSRecursiveLock
 
 // Default initializer
 - init
 {
   [super init];
-
   // Allocate the mutex from the runtime
   mutex = objc_mutex_allocate();
-	if (!mutex)
-		return nil;
-	else
+  NSParameterAssert (mutex);
   return self;
 }
 
-- (void)dealloc
+- (void) dealloc
 {
   // Ask the runtime to deallocate the mutex
   // If there are outstanding locks then it will block.
   objc_mutex_deallocate(mutex);
-
   [super dealloc];
 }
 
 // Try to acquire the lock
 // Does not block
-- (BOOL)tryLock
+- (BOOL) tryLock
 {
   // Ask the runtime to acquire a lock on the mutex
-	if (objc_mutex_trylock(mutex) == -1)
+  if (objc_mutex_trylock (mutex) == -1)
     return NO;
   else
     return YES;
 }
 
 // NSLocking protocol
-- (void)lock
+- (void) lock
 {
   // Ask the runtime to acquire a lock on the mutex
   // This will block
-	objc_mutex_lock(mutex);
+  objc_mutex_lock (mutex);
 }
 
-- (void)unlock
+- (void) unlock
 {
   // Ask the runtime to release a lock onthe mutex
-	objc_mutex_unlock(mutex);
+  objc_mutex_unlock (mutex);
 }
 
 @end