gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidy positioning of semicolon to be inside IF_NO_ARC() macros so it won't appear in the source when compiled with ARC

Browse source
This commit is contained in:
Richard Frith-Macdonald 2022-02-17 10:21:36 +00:00
parent c76ebf2962
commit 0b1a2d4d66
18 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Additions/GSInsensitiveDictionary.m
View file

@ -198,7 +198,7 @@ static SEL objSel;
node = GSIMapNodeForKey(&map, (GSIMapKey)(id)keys[i]);
if (node)
{
IF_NO_ARC(RETAIN(objs[i]));
IF_NO_ARC(RETAIN(objs[i]);)
RELEASE(node->value.obj);
node->value.obj = objs[i];
}
@ -428,7 +428,7 @@ static SEL objSel;
node = GSIMapNodeForKey(&map, (GSIMapKey)aKey);
if (node)
{
IF_NO_ARC(RETAIN(anObject));
IF_NO_ARC(RETAIN(anObject);)
RELEASE(node->value.obj);
node->value.obj = anObject;
}

2
Source/GSArray.m
View file

@ -964,7 +964,7 @@ static Class GSInlineArrayClass;
if ((self = [super init]) != nil)
{
array = anArray;
IF_NO_ARC(RETAIN(array));
IF_NO_ARC(RETAIN(array);)
pos = 0;
}
return self;

4
Source/GSDictionary.m
View file

@ -213,7 +213,7 @@ static SEL objSel;
node = GSIMapNodeForKey(&map, (GSIMapKey)(id)keys[i]);
if (node)
{
IF_NO_ARC(RETAIN(objs[i]));
IF_NO_ARC(RETAIN(objs[i]);)
RELEASE(node->value.obj);
node->value.obj = objs[i];
}
@ -451,7 +451,7 @@ static SEL objSel;
node = GSIMapNodeForKey(&map, (GSIMapKey)aKey);
if (node)
{
IF_NO_ARC(RETAIN(anObject));
IF_NO_ARC(RETAIN(anObject);)
RELEASE(node->value.obj);
node->value.obj = anObject;
}

2
Source/NSArray.m
View file

@ -2658,7 +2658,7 @@ compare(id elem1, id elem2, void* context)
if (self != nil)
{
array = anArray;
IF_NO_ARC(RETAIN(array));
IF_NO_ARC(RETAIN(array);)
pos = 0;
get = [array methodForSelector: oaiSel];
cnt = (NSUInteger (*)(NSArray*, SEL))[array methodForSelector: countSel];

8
Source/NSAttributedString.m
View file

@ -716,7 +716,7 @@ appendUIntData(NSMutableData *d, NSUInteger i)
RELEASE(m);
}
IF_NO_ARC(AUTORELEASE(newAttrString));
IF_NO_ARC(AUTORELEASE(newAttrString);)
return newAttrString;
}
@ -894,7 +894,7 @@ appendUIntData(NSMutableData *d, NSUInteger i)
newDict = (*initDictImp)(newDict, initDictSel, attrDict);
(*setDictImp)(newDict, setDictSel, value, name);
(*setImp)(self, setSel, newDict, effectiveRange);
IF_NO_ARC((*relDictImp)(newDict, relDictSel));
IF_NO_ARC((*relDictImp)(newDict, relDictSel);)
if (NSMaxRange(effectiveRange) >= NSMaxRange(aRange))
{
@ -954,7 +954,7 @@ appendUIntData(NSMutableData *d, NSUInteger i)
newDict = (*initDictImp)(newDict, initDictSel, attrDict);
(*addDictImp)(newDict, addDictSel, attributes);
(*setImp)(self, setSel, newDict, effectiveRange);
IF_NO_ARC((*relDictImp)(newDict, relDictSel));
IF_NO_ARC((*relDictImp)(newDict, relDictSel);)
if (NSMaxRange(effectiveRange) >= NSMaxRange(aRange))
{
@ -1003,7 +1003,7 @@ appendUIntData(NSMutableData *d, NSUInteger i)
newDict = (*initDictImp)(newDict, initDictSel, attrDict);
(*remDictImp)(newDict, remDictSel, name);
(*setImp)(self, setSel, newDict, effectiveRange);
IF_NO_ARC((*relDictImp)(newDict, relDictSel));
IF_NO_ARC((*relDictImp)(newDict, relDictSel);)
if (NSMaxRange(effectiveRange) >= NSMaxRange(aRange))
{

2
Source/NSCallBacks.m
View file

@ -152,7 +152,7 @@ _NS_id_is_equal(void *table, id <NSObject> o, id <NSObject> p)
void
_NS_id_retain(void *table, id <NSObject> o)
{
IF_NO_ARC(RETAIN(o));
IF_NO_ARC(RETAIN(o);)
return;
}

4
Source/NSData.m
View file

@ -1826,7 +1826,7 @@ failure:
{
att = [[mgr fileAttributesAtPath: path
traverseLink: YES] mutableCopy];
IF_NO_ARC(AUTORELEASE(att));
IF_NO_ARC(AUTORELEASE(att);)
}
/* To replace the existing file on windows, it must be writable.
@ -2083,7 +2083,7 @@ failure:
{
NSMutableDictionary *mAtt = [att mutableCopy];
IF_NO_ARC(AUTORELEASE(mAtt));
IF_NO_ARC(AUTORELEASE(mAtt);)
/*
* We have created a new file - so we attempt to make it's
* attributes match that of the original.

2
Source/NSDateFormatter.m
View file

@ -132,7 +132,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
{
NSDateFormatter *o = (id)NSCopyObject(self, 0, zone);
IF_NO_ARC(RETAIN(o->_dateFormat));
IF_NO_ARC(RETAIN(o->_dateFormat);)
if (0 != internal)
{
GS_COPY_INTERNAL(o, zone)

6
Source/NSInvocation.m
View file

@ -490,7 +490,7 @@ _arg_addr(NSInvocation *inv, int index)
_get_arg(self, index, &old);
_set_arg(self, index, buffer);
IF_NO_ARC(RETAIN(*(id*)buffer));
IF_NO_ARC(RETAIN(*(id*)buffer);)
if (old != nil)
{
RELEASE(old);
@ -634,7 +634,7 @@ _arg_addr(NSInvocation *inv, int index)
_get_arg(self, i-1, &old);
if (old != nil)
{
IF_NO_ARC(RETAIN(old));
IF_NO_ARC(RETAIN(old);)
}
}
else if (*_inf[i].type == _C_CHARPTR)
@ -661,7 +661,7 @@ _arg_addr(NSInvocation *inv, int index)
{
_targetRetained = YES;
IF_NO_ARC(RETAIN(_target));
IF_NO_ARC(RETAIN(_target);)
}
}

4
Source/NSMessagePort.m
View file

@ -1371,7 +1371,7 @@ typedef struct {
IF_NO_ARC([port retain];)
NSDebugMLLog(@"NSMessagePort", @"Using pre-existing port: %@", port);
}
IF_NO_ARC(AUTORELEASE(port));
IF_NO_ARC(AUTORELEASE(port);)
M_UNLOCK(messagePortLock);
return port;
@ -1693,7 +1693,7 @@ typedef struct {
{
M_LOCK(myLock);
handle = (GSMessageHandle*)NSMapGet(handles, (void*)(uintptr_t)desc);
IF_NO_ARC(AUTORELEASE(RETAIN(handle)));
IF_NO_ARC(AUTORELEASE(RETAIN(handle));)
M_UNLOCK(myLock);
if (handle == nil)
{

4
Source/NSPortCoder.m
View file

@ -633,7 +633,7 @@ scalarSize(char type)
* order to give the appearance that it's actually a
* new object.
*/
IF_NO_ARC(RETAIN(obj));
IF_NO_ARC(RETAIN(obj);)
}
else
{
@ -705,7 +705,7 @@ scalarSize(char type)
* order to give the appearance that it's actually a
* new object.
*/
IF_NO_ARC(RETAIN(obj));
IF_NO_ARC(RETAIN(obj);)
}
else
{

14
Source/NSProcessInfo.m
View file

@ -306,7 +306,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
}
/* Getting the process name */
IF_NO_ARC(RELEASE(_gnu_processName));
IF_NO_ARC(RELEASE(_gnu_processName);)
_gnu_processName = [arg0 lastPathComponent];
#if defined(_WIN32)
/* On windows we remove any .exe extension for consistency with app names
@ -321,7 +321,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
}
}
#endif
IF_NO_ARC(RETAIN(_gnu_processName));
IF_NO_ARC(RETAIN(_gnu_processName);)
/* Copy the argument list */
#if defined(_WIN32)
@ -349,7 +349,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
}
}
IF_NO_ARC(RELEASE(_gnu_arguments));
IF_NO_ARC(RELEASE(_gnu_arguments);)
_gnu_arguments = [[NSArray alloc] initWithObjects: obj_argv count: added];
RELEASE(arg0);
}
@ -376,7 +376,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
obj_argv[added++] = str;
}
IF_NO_ARC(RELEASE(_gnu_arguments));
IF_NO_ARC(RELEASE(_gnu_arguments);)
_gnu_arguments = [[NSArray alloc] initWithObjects: obj_argv count: added];
RELEASE(arg0);
}
@ -458,11 +458,11 @@ _gnu_process_args(int argc, char *argv[], char *env[])
i++;
}
}
IF_NO_ARC(RELEASE(_gnu_environment));
IF_NO_ARC(RELEASE(_gnu_environment);)
_gnu_environment = [[NSDictionary alloc] initWithObjects: values
forKeys: keys];
IF_NO_ARC(RELEASE(keys));
IF_NO_ARC(RELEASE(values));
IF_NO_ARC(RELEASE(keys);)
IF_NO_ARC(RELEASE(values);)
}
[arp drain];
}

6
Source/NSRunLoop.m
View file

@ -284,7 +284,7 @@ static inline BOOL timerInvalidated(NSTimer *t)
{
GSTimedPerformer *array[count];
IF_NO_ARC(RETAIN(target));
IF_NO_ARC(RETAIN(target);)
[perf getObjects: array];
while (count-- > 0)
{
@ -318,8 +318,8 @@ static inline BOOL timerInvalidated(NSTimer *t)
{
GSTimedPerformer *array[count];
IF_NO_ARC(RETAIN(target));
IF_NO_ARC(RETAIN(arg));
IF_NO_ARC(RETAIN(target);)
IF_NO_ARC(RETAIN(arg);)
[perf getObjects: array];
while (count-- > 0)
{

2
Source/NSScanner.m
View file

@ -153,7 +153,7 @@ typedef GSString *ivars;
memSel = @selector(characterIsMember:);
defaultSkipSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
IF_NO_ARC(RETAIN(defaultSkipSet));
IF_NO_ARC(RETAIN(defaultSkipSet);)
NSStringClass = [NSString class];
GSCStringClass = [GSCString class];
GSUnicodeStringClass = [GSUnicodeString class];

6
Source/NSSocketPort.m
View file

@ -1703,7 +1703,7 @@ static Class tcpPortClass;
if (thePorts != 0)
{
port = (NSSocketPort*)NSMapGet(thePorts, (void*)aHost);
IF_NO_ARC(AUTORELEASE(RETAIN(port)));
IF_NO_ARC(AUTORELEASE(RETAIN(port));)
}
M_UNLOCK(tcpPortLock);
return port;
@ -1928,7 +1928,7 @@ static Class tcpPortClass;
IF_NO_ARC(RETAIN(port);)
NSDebugMLLog(@"NSPort", @"Using pre-existing port: %@", port);
}
IF_NO_ARC(AUTORELEASE(port));
IF_NO_ARC(AUTORELEASE(port);)
M_UNLOCK(tcpPortLock);
return port;
@ -2420,7 +2420,7 @@ static Class tcpPortClass;
desc = (SOCKET)NSMapGet(events, (void*)(uintptr_t)event);
#endif
handle = (GSTcpHandle*)NSMapGet(handles, (void*)(uintptr_t)desc);
IF_NO_ARC(AUTORELEASE(RETAIN(handle)));
IF_NO_ARC(AUTORELEASE(RETAIN(handle));)
M_UNLOCK(myLock);
if (handle == nil)
{

10
Source/NSSocketPortNameServer.m
View file

@ -460,7 +460,7 @@ typedef enum {
if (state == GSPC_FAIL)
return;
IF_NO_ARC(RETAIN(handle));
IF_NO_ARC(RETAIN(handle);)
nc = [NSNotificationCenter defaultCenter];
[nc addObserver: self
selector: @selector(didConnect:)
@ -494,7 +494,7 @@ typedef enum {
msg.port = 0;
TEST_RELEASE(data);
data = [NSMutableData dataWithBytes: (void*)&msg length: sizeof(msg)];
IF_NO_ARC(RETAIN(data));
IF_NO_ARC(RETAIN(data);)
[self open: nil];
}
@ -507,7 +507,7 @@ typedef enum {
[name getCString: (char*)msg.name];
TEST_RELEASE(data);
data = [NSMutableData dataWithBytes: (void*)&msg length: sizeof(msg)];
IF_NO_ARC(RETAIN(data));
IF_NO_ARC(RETAIN(data);)
[self open: host];
}
@ -520,7 +520,7 @@ typedef enum {
msg.port = GSSwapHostI32ToBig(portNumber);
TEST_RELEASE(data);
data = [NSMutableData dataWithBytes: (void*)&msg length: sizeof(msg)];
IF_NO_ARC(RETAIN(data));
IF_NO_ARC(RETAIN(data);)
[self open: nil];
}
@ -540,7 +540,7 @@ typedef enum {
msg.port = GSSwapHostI32ToBig(portNumber);
TEST_RELEASE(data);
data = [NSMutableData dataWithBytes: (void*)&msg length: sizeof(msg)];
IF_NO_ARC(RETAIN(data));
IF_NO_ARC(RETAIN(data);)
[self open: nil];
}

6
Source/NSTimeZone.m
View file

@ -393,7 +393,7 @@ static NSString *_time_zone_path(NSString *subpath, NSString *type)
{
zone = nil;
}
IF_NO_ARC(RETAIN(zone));
IF_NO_ARC(RETAIN(zone);)
GS_MUTEX_UNLOCK(zone_mutex);
if (zone == nil)
@ -709,7 +709,7 @@ static NSMapTable *absolutes = 0;
z = commonAbsolutes[anOffset/900 + 72];
if (z != nil)
{
IF_NO_ARC(RETAIN(z));
IF_NO_ARC(RETAIN(z);)
DESTROY(self);
return z;
}
@ -719,7 +719,7 @@ static NSMapTable *absolutes = 0;
z = (GSAbsTimeZone*)NSMapGet(absolutes, (void*)(uintptr_t)anOffset);
if (z != nil)
{
IF_NO_ARC(RETAIN(z));
IF_NO_ARC(RETAIN(z);)
DESTROY(self);
}
else

4
Source/NSUnarchiver.m
View file

@ -903,7 +903,7 @@ scalarSize(char type)
* order to give the appearance that it's actually a
* new object.
*/
IF_NO_ARC(RETAIN(obj));
IF_NO_ARC(RETAIN(obj);)
}
else
{
@ -1506,7 +1506,7 @@ scalarSize(char type)
at: b];
d = [[NSData allocWithZone: zone] initWithBytesNoCopy: b
length: l];
IF_NO_ARC(AUTORELEASE(d));
IF_NO_ARC(AUTORELEASE(d);)
return d;
}
else