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

Another check to make sure description *can't* log errors about objects not

Browse source 
being valid in plist.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15162 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-11-28 06:47:13 +00:00
parent 358af46bbd
commit 0488255244
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Source/GSCompatibility.m
View file

@ -446,9 +446,10 @@ static NSString *indentStrings[] = {
@"\t\t\t\t\t\t" @"\t\t\t\t\t\t"
}; };
#define PLNEW 0 #define PLNEW 0 // New extended OpenStep property list
#define PLXML 1 #define PLXML 1 // New MacOS-X XML property list
#define PLOLD 2 #define PLOLD 2 // Old (standard) OpenStep property list
#define PLDSC 3 // Just a description
/** /**
* obj is the object to be written out<br /> * obj is the object to be written out<br />
* loc is the locale for formatting (or nil to indicate no formatting)<br /> * loc is the locale for formatting (or nil to indicate no formatting)<br />
@ -894,7 +895,11 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
} }
else else
{ {
if (x == PLXML) if (x == PLDSC)
{
Append([obj description], dest);
}
else if (x == PLXML)
{ {
NSDebugLog(@"Non-property-list class (%@) encoded as string", NSDebugLog(@"Non-property-list class (%@) encoded as string",
NSStringFromClass([obj class])); NSStringFromClass([obj class]));
@ -902,16 +907,12 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
XString([obj description], dest); XString([obj description], dest);
Append(@"</string>\n", dest); Append(@"</string>\n", dest);
} }
else if (x == PLNEW) else
{ {
NSDebugLog(@"Non-property-list class (%@) encoded as string", NSDebugLog(@"Non-property-list class (%@) encoded as string",
NSStringFromClass([obj class])); NSStringFromClass([obj class]));
Append([obj description], dest); Append([obj description], dest);
} }
else
{
Append([obj description], dest);
}
} }
} }
@ -966,7 +967,11 @@ GSPropertyListMake(id obj, NSDictionary *loc, BOOL xml,
} }
dest = *str; dest = *str;
if (xml == YES) if (forDescription)
{
style = PLDSC;
}
else if (xml == YES)
{ {
Append([NSMutableString stringWithCString: Append([NSMutableString stringWithCString:
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist " "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist "
@ -975,7 +980,7 @@ GSPropertyListMake(id obj, NSDictionary *loc, BOOL xml,
"<plist version=\"0.9\">\n"], dest); "<plist version=\"0.9\">\n"], dest);
style = PLXML; style = PLXML;
} }
else if (forDescription || GSUserDefaultsFlag(NSWriteOldStylePropertyLists)) else if (GSUserDefaultsFlag(NSWriteOldStylePropertyLists))
{ {
style = PLOLD; style = PLOLD;
} }