gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSArray.m: Consistently terminate macros with semicolons.

Browse source 
(arrayByAddingObjectsFromArray)
        (removeObjectsFromIndices:numIndices:): Insure all
	declarations precede statements.
        * Source/NSDictionary.m: Consistently terminate macros with
        semicolons.
        * Source/NSSet.m (initWithCoder:): Insure all declarations
	precede statements.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20043 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-09-10 15:10:54 +00:00
parent 80e3f9b87a
commit af4a020d02
4 changed files with 51 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Source/NSDictionary.m
View file

@ -418,14 +418,14 @@ static SEL appSel;
}
else
{
GS_BEGINIDBUF(o, objectCount*2)
GS_BEGINIDBUF(o, objectCount*2);
[objects getObjects: o];
[keys getObjects: o + objectCount];
self = [self initWithObjects: o
forKeys: o + objectCount
count: objectCount];
GS_ENDIDBUF()
GS_ENDIDBUF();
}
return self;
}
@ -504,7 +504,7 @@ static SEL appSel;
unsigned i = 0;
IMP nxtObj = [e methodForSelector: nxtSel];
IMP otherObj = [other methodForSelector: objSel];
GS_BEGINIDBUF(o, c*2)
GS_BEGINIDBUF(o, c*2);
if (shouldCopy)
{
@ -534,7 +534,7 @@ static SEL appSel;
}
self = [self initWithObjects: o + c forKeys: o count: c];
}
GS_ENDIDBUF()
GS_ENDIDBUF();
}
return self;
}
@ -734,7 +734,7 @@ static SEL appSel;
IMP nxtObj = [e methodForSelector: nxtSel];
unsigned i;
id result;
GS_BEGINIDBUF(k, c)
GS_BEGINIDBUF(k, c);
for (i = 0; i < c; i++)
{
@ -743,7 +743,7 @@ static SEL appSel;
}
result = [[NSArray_class allocWithZone: NSDefaultMallocZone()]
initWithObjects: k count: c];
GS_ENDIDBUF()
GS_ENDIDBUF();
return AUTORELEASE(result);
}
}
@ -765,7 +765,7 @@ static SEL appSel;
IMP nxtObj = [e methodForSelector: nxtSel];
id result;
unsigned i;
GS_BEGINIDBUF(k, c)
GS_BEGINIDBUF(k, c);
for (i = 0; i < c; i++)
{
@ -773,7 +773,7 @@ static SEL appSel;
}
result = [[NSArray_class allocWithZone: NSDefaultMallocZone()]
initWithObjects: k count: c];
GS_ENDIDBUF()
GS_ENDIDBUF();
return AUTORELEASE(result);
}
}
@ -798,7 +798,7 @@ static SEL appSel;
BOOL (*eqObj)(id, SEL, id);
id k;
id result;
GS_BEGINIDBUF(a, [self count])
GS_BEGINIDBUF(a, [self count]);
eqObj = (BOOL (*)(id, SEL, id))[anObject methodForSelector: eqSel];
c = 0;
@ -820,7 +820,7 @@ static SEL appSel;
result = [[NSArray_class allocWithZone: NSDefaultMallocZone()]
initWithObjects: a count: c];
}
GS_ENDIDBUF()
GS_ENDIDBUF();
return AUTORELEASE(result);
}
}
@ -875,7 +875,7 @@ compareIt(id o1, id o2, void* context)
unsigned i;
IMP myObj = [self methodForSelector: objSel];
id result;
GS_BEGINIDBUF(obuf, c)
GS_BEGINIDBUF(obuf, c);
[keys getObjects: obuf];
for (i = 0; i < c; i++)
@ -893,7 +893,7 @@ compareIt(id o1, id o2, void* context)
}
result = [[NSArray_class allocWithZone: NSDefaultMallocZone()]
initWithObjects: obuf count: c];
GS_ENDIDBUF()
GS_ENDIDBUF();
return AUTORELEASE(result);
}
}
@ -1099,7 +1099,7 @@ compareIt(id o1, id o2, void* context)
NSEnumerator *enumerator = [self keyEnumerator];
IMP nxtImp = [enumerator methodForSelector: nxtSel];
IMP objImp = [self methodForSelector: objSel];
GS_BEGINIDBUF(o, count*2)
GS_BEGINIDBUF(o, count*2);
for (i = 0; (key = (*nxtImp)(enumerator, nxtSel)); i++)
{
@ -1117,7 +1117,7 @@ compareIt(id o1, id o2, void* context)
[o[count + i] release];
}
#endif
GS_ENDIDBUF()
GS_ENDIDBUF();
return newDictionary;
}
@ -1228,14 +1228,14 @@ compareIt(id o1, id o2, void* context)
if (c > 0)
{
IMP remObj = [self methodForSelector: remSel];
GS_BEGINIDBUF(keys, c)
GS_BEGINIDBUF(keys, c);
[keyArray getObjects: keys];
while (c--)
{
(*remObj)(self, remSel, keys[c]);
}
GS_ENDIDBUF()
GS_ENDIDBUF();
}
}