mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
Updates to reduce global namespace pollution. Plenty more remaining.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23795 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4874117588
commit
31342aef09
85 changed files with 1090 additions and 1277 deletions
|
@ -228,30 +228,35 @@ struct NSUserDefaultsWin32_DomainInfo
|
|||
id v;
|
||||
NSString *k;
|
||||
|
||||
switch (type) {
|
||||
case REG_SZ: {
|
||||
int datacharlen = datalen / 2;
|
||||
if (datacharlen > 0 && data[datacharlen-1] == 0)
|
||||
datacharlen--;
|
||||
switch (type)
|
||||
{
|
||||
case REG_SZ:
|
||||
{
|
||||
int datacharlen = datalen / 2;
|
||||
if (datacharlen > 0 && data[datacharlen-1] == 0)
|
||||
datacharlen--;
|
||||
|
||||
v = [NSString stringWithCharacters:data length:datacharlen];
|
||||
}
|
||||
break;
|
||||
case REG_BINARY: {
|
||||
v = [NSString stringWithCString: (char*)data
|
||||
encoding: NSASCIIStringEncoding];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
NSLog(@"Bad registry type %d for '%S'", type, name);
|
||||
v = 0;
|
||||
}
|
||||
v = [NSString stringWithCharacters: data
|
||||
length: datacharlen];
|
||||
}
|
||||
break;
|
||||
case REG_BINARY:
|
||||
{
|
||||
v = [NSString stringWithCString: (char*)data
|
||||
encoding: NSASCIIStringEncoding];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
NSLog(@"Bad registry type %d for '%S'", type, name);
|
||||
v = 0;
|
||||
}
|
||||
v = [v propertyList];
|
||||
if (v)
|
||||
{
|
||||
k = [NSString stringWithCharacters: name length: namelen];
|
||||
[domainDict setObject: v forKey: k];
|
||||
}
|
||||
{
|
||||
k = [NSString stringWithCharacters: name
|
||||
length: namelen];
|
||||
[domainDict setObject: v forKey: k];
|
||||
}
|
||||
}
|
||||
NS_HANDLER
|
||||
NSLog(@"Bad registry value for '%S'", name);
|
||||
|
@ -319,30 +324,35 @@ struct NSUserDefaultsWin32_DomainInfo
|
|||
id v;
|
||||
NSString *k;
|
||||
|
||||
switch (type) {
|
||||
case REG_SZ: {
|
||||
int datacharlen = datalen / 2;
|
||||
if (datacharlen > 0 && data[datacharlen-1] == 0)
|
||||
datacharlen--;
|
||||
switch (type)
|
||||
{
|
||||
case REG_SZ:
|
||||
{
|
||||
int datacharlen = datalen / 2;
|
||||
if (datacharlen > 0 && data[datacharlen-1] == 0)
|
||||
datacharlen--;
|
||||
|
||||
v = [NSString stringWithCharacters:data length:datacharlen];
|
||||
}
|
||||
break;
|
||||
case REG_BINARY: {
|
||||
v = [NSString stringWithCString: (char*)data
|
||||
encoding: NSASCIIStringEncoding];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
NSLog(@"Bad registry type %d for '%S'", type, name);
|
||||
v = 0;
|
||||
}
|
||||
v = [NSString stringWithCharacters: data
|
||||
length: datacharlen];
|
||||
}
|
||||
break;
|
||||
case REG_BINARY:
|
||||
{
|
||||
v = [NSString stringWithCString: (char*)data
|
||||
encoding: NSASCIIStringEncoding];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
NSLog(@"Bad registry type %d for '%S'", type, name);
|
||||
v = 0;
|
||||
}
|
||||
v = [v propertyList];
|
||||
if (v)
|
||||
{
|
||||
k = [NSString stringWithCharacters: name length: namelen];
|
||||
[domainDict setObject: v forKey: k];
|
||||
}
|
||||
{
|
||||
k = [NSString stringWithCharacters: name
|
||||
length: namelen];
|
||||
[domainDict setObject: v forKey: k];
|
||||
}
|
||||
}
|
||||
NS_HANDLER
|
||||
NSLog(@"Bad registry value for '%S'", name);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue