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

Handle nil objects in property list ... treat as strings.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20896 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-03-11 11:53:00 +00:00
parent 2dd5efe31d
commit 2337ddd4b4
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,9 +1,14 @@
2005-03-11 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPropertyList.m: Handle null object passed to OAppend()
2005-03-11 David Wetzel <dave@turbocat.de>
* Source/Additions/GSMime.m:
* Headers/Additions/GNUstepBase/GSMime.h
Added setDefaultEncoding:
This is needed in GSWeb if you use utf-8 and faster than using a
String as encoding name.
2005-03-09 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSCharacterSet.m: Fix bug in forming union ... was using

22
Source/NSPropertyList.m
View file

@ -1992,10 +1992,21 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
}
else
{
NSString *cls;
if (obj == nil)
{
obj = @"(nil)";
cls = @"(nil)";
}
else
{
cls = NSStringFromClass([obj class]);
}
if (x == NSPropertyListXMLFormat_v1_0)
{
NSDebugLog(@"Non-property-list class (%@) encoded as string",
NSStringFromClass([obj class]));
NSDebugLog(@"Non-property-list class (%@) encoded as string", cls);
[dest appendBytes: "<string>" length: 8];
XString([obj description], dest);
[dest appendBytes: "</string>" length: 9];
@ -2010,14 +2021,13 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
{
plobj = [desc propertyList];
NSDebugLog(@"Non-property-list class (%@) "
@"encoded as description's property-list",
NSStringFromClass([obj class]));
@"encoded as description's property-list", cls);
}
NS_HANDLER
{
plobj = desc;
NSDebugLog(@"Non-property-list class (%@) encoded as string",
NSStringFromClass([obj class]));
NSDebugLog(@"Non-property-list class (%@) "
@"encoded as string", cls);
}
NS_ENDHANDLER
OAppend(plobj, loc, lev, step, x, dest);