From ba31196455cf897a0cc32c8a3f4f76dc9e2a08cc Mon Sep 17 00:00:00 2001 From: rfm Date: Sat, 26 Feb 2011 21:42:20 +0000 Subject: [PATCH] fixup ugly coding stype to improve maintainability git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32384 72102866-910b-0410-8b05-ffd578937521 --- Source/GSBlocks.m | 67 +++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/Source/GSBlocks.m b/Source/GSBlocks.m index 52894f752..7998684c3 100644 --- a/Source/GSBlocks.m +++ b/Source/GSBlocks.m @@ -1,7 +1,8 @@ #import -// Declare the block copy functions ourself so that we don't depend on a -// specific header location. +/* Declare the block copy functions ourself so that we don't depend on a + * specific header location. + */ void *_Block_copy(void *); void _Block_release(void *); @@ -9,44 +10,52 @@ void _Block_release(void *); @end @implementation GSBlock -+ (void)load ++ (void) load { - unsigned int methodCount; - Method *m = NULL; - Method *methods = - class_copyMethodList(self, &methodCount); - id blockClass = objc_lookUpClass("_NSBlock"); - Protocol *nscopying = NULL; + unsigned int methodCount; + Method *m = NULL; + Method *methods = class_copyMethodList(self, &methodCount); + id blockClass = objc_lookUpClass("_NSBlock"); + Protocol *nscopying = NULL; - // If we don't have an _NSBlock class, we don't have blocks support in the - // runtime, so give up. - if (nil == blockClass) { return; } + /* If we don't have an _NSBlock class, we don't have blocks support in the + * runtime, so give up. + */ + if (nil == blockClass) + { + return; + } - // Copy all of the methods in this class onto the block-runtime-provided - // _NSBlock - for (m = methods ; NULL!=*m ; m++) - { - class_addMethod(blockClass, method_getName(*m), - method_getImplementation(*m), method_getTypeEncoding(*m)); - } - nscopying = objc_getProtocol("NSCopying"); - class_addProtocol(blockClass, nscopying); + /* Copy all of the methods in this class onto the block-runtime-provided + * _NSBlock + */ + for (m = methods; NULL != *m; m++) + { + class_addMethod(blockClass, method_getName(*m), + method_getImplementation(*m), method_getTypeEncoding(*m)); + } + nscopying = objc_getProtocol("NSCopying"); + class_addProtocol(blockClass, nscopying); } -- (id)copyWithZone: (NSZone*)aZone + +- (id) copyWithZone: (NSZone*)aZone { - return _Block_copy(self); + return _Block_copy(self); } -- (id)copy + +- (id) copy { - return _Block_copy(self); + return _Block_copy(self); } -- (id)retain + +- (id) retain { - return _Block_copy(self); + return _Block_copy(self); } -- (void)release + +- (void) release { - _Block_release(self); + _Block_release(self); } @end