gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidyups

Browse source
This commit is contained in:
rfm 2024-12-04 11:00:26 +00:00
parent 7ac6931039
commit 815a0d7b20
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/NSProcessInfo.m
View file

@ -268,9 +268,9 @@ static NSString *_androidCacheDir = nil;
static void
_gnu_process_args(int argc, char *argv[], char *env[])
{
NSAutoreleasePool *arp = [NSAutoreleasePool new];
ENTER_POOL
NSString *arg0 = nil;
int i;
int i;
if (_gnu_arg_zero != 0)
{
@ -330,7 +330,7 @@ _gnu_process_args(int argc, char *argv[], char *env[])
}
/* Getting the process name */
IF_NO_ARC(RELEASE(_gnu_processName);)
IF_NO_ARC([_gnu_processName release];)
_gnu_processName = [arg0 lastPathComponent];
#if defined(_WIN32)
/* On windows we remove any .exe extension for consistency with app names
@ -373,9 +373,9 @@ _gnu_process_args(int argc, char *argv[], char *env[])
}
}
IF_NO_ARC(RELEASE(_gnu_arguments);)
IF_NO_ARC([_gnu_arguments release];)
_gnu_arguments = [[NSArray alloc] initWithObjects: obj_argv count: added];
RELEASE(arg0);
IF_NO_ARC([arg0 release];)
}
#else
if (argv)
@ -400,9 +400,9 @@ _gnu_process_args(int argc, char *argv[], char *env[])
obj_argv[added++] = str;
}
IF_NO_ARC(RELEASE(_gnu_arguments);)
IF_NO_ARC([_gnu_arguments release];)
_gnu_arguments = [[NSArray alloc] initWithObjects: obj_argv count: added];
RELEASE(arg0);
IF_NO_ARC([arg0 release];)
}
#endif
@ -482,13 +482,13 @@ _gnu_process_args(int argc, char *argv[], char *env[])
i++;
}
}
IF_NO_ARC(RELEASE(_gnu_environment);)
IF_NO_ARC([_gnu_environment release];)
_gnu_environment = [[NSDictionary alloc] initWithObjects: values
forKeys: keys];
IF_NO_ARC(RELEASE(keys);)
IF_NO_ARC(RELEASE(values);)
IF_NO_ARC([keys release];)
IF_NO_ARC([values release];)
}
[arp drain];
LEAVE_POOL
}
#if !GS_FAKE_MAIN && ((defined(HAVE_PROCFS) || defined(HAVE_KVM_ENV) || defined(HAVE_PROCFS_PSINFO) || defined(__APPLE__)) && (defined(HAVE_LOAD_METHOD)))

14
Source/NSUserDefaults.m
View file

@ -735,7 +735,7 @@ newLanguages(NSArray *oldNames)
* the +_createArgumentDictionary: method.
*/
args = [[NSProcessInfo processInfo] arguments];
enumerator = [[[NSProcessInfo processInfo] arguments] objectEnumerator];
enumerator = [args objectEnumerator];
[enumerator nextObject]; // Skip process name.
while (nil != (key = [enumerator nextObject]))
{
@ -1543,14 +1543,16 @@ newLanguages(NSArray *oldNames)
[_lock lock];
NS_DURING
{
GSPersistentDomain *pd = [_persDomains objectForKey: bundleIdentifier];
id old = [self objectForKey: defaultName];
GSPersistentDomain *pd;
if (nil != pd)
if (nil != (pd = [_persDomains objectForKey: bundleIdentifier]))
{
if ([pd setObject: nil forKey: defaultName])
{
id new;
id old;
id new;
old = [self objectForKey: defaultName];
[self _changePersistentDomain: bundleIdentifier];
new = [self objectForKey: defaultName];
/* Emit only a KVO notification when the value has actually
@ -2093,7 +2095,7 @@ static BOOL isPlistObject(id o)
_lastSync = saved;
}
// Check and if not existent add the Application and the Global domains
if ([_persDomains objectForKey: bundleIdentifier] == nil)
if (bundleIdentifier && [_persDomains objectForKey: bundleIdentifier] == nil)
{
GSPersistentDomain *pd;