From 71620a595cda1ce6fc030af7cb3c82f05bde5b10 Mon Sep 17 00:00:00 2001 From: CaS Date: Wed, 27 Nov 2002 16:39:17 +0000 Subject: [PATCH] Fix output of property lists in incorrect encoding. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15144 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 2 ++ Source/NSArray.m | 12 ++++++++---- Source/NSDictionary.m | 13 ++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55ee08a6b..4d3cb2e56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ style property-lists rather than new style or xml style. * Source/NSUser.m: Use USERPROFILE for default home directory on windoze. + * Source/NSArray.m: Write non-xml property lists as ascii. + * Source/NSDictionary.m: Write non-xml property lists as ascii. 2002-11-26 Richard Frith-Macdonald diff --git a/Source/NSArray.m b/Source/NSArray.m index e692dfdd1..5efe1e618 100644 --- a/Source/NSArray.m +++ b/Source/NSArray.m @@ -1029,18 +1029,20 @@ static int compare(id elem1, id elem2, void* context) { NSDictionary *loc = GSUserDefaultsDictionaryRepresentation(); NSString *desc = nil; + NSData *data; if (GSMacOSXCompatiblePropertyLists() == YES) { GSPropertyListMake(self, loc, YES, NO, 2, &desc); + data = [desc dataUsingEncoding: NSUTF8StringEncoding]; } else { GSPropertyListMake(self, loc, NO, NO, 2, &desc); + data = [desc dataUsingEncoding: NSASCIIStringEncoding]; } - return [[desc dataUsingEncoding: NSUTF8StringEncoding] - writeToFile: path atomically: useAuxiliaryFile]; + return [data writeToFile: path atomically: useAuxiliaryFile]; } /** @@ -1053,18 +1055,20 @@ static int compare(id elem1, id elem2, void* context) { NSDictionary *loc = GSUserDefaultsDictionaryRepresentation(); NSString *desc = nil; + NSData *data; if (GSMacOSXCompatiblePropertyLists() == YES) { GSPropertyListMake(self, loc, YES, NO, 2, &desc); + data = [desc dataUsingEncoding: NSUTF8StringEncoding]; } else { GSPropertyListMake(self, loc, NO, NO, 2, &desc); + data = [desc dataUsingEncoding: NSASCIIStringEncoding]; } - return [[desc dataUsingEncoding: NSUTF8StringEncoding] - writeToURL: url atomically: useAuxiliaryFile]; + return [data writeToURL: url atomically: useAuxiliaryFile]; } @end diff --git a/Source/NSDictionary.m b/Source/NSDictionary.m index 7144b4cb2..f4dc30ed7 100644 --- a/Source/NSDictionary.m +++ b/Source/NSDictionary.m @@ -743,18 +743,19 @@ compareIt(id o1, id o2, void* context) { NSDictionary *loc = GSUserDefaultsDictionaryRepresentation(); NSString *desc = nil; + NSData *data; if (GSMacOSXCompatiblePropertyLists() == YES) { GSPropertyListMake(self, loc, YES, NO, 2, &desc); + data = [desc dataUsingEncoding: NSUTF8StringEncoding]; } else { GSPropertyListMake(self, loc, NO, NO, 2, &desc); + data = [desc dataUsingEncoding: NSASCIIStringEncoding]; } - - return [[desc dataUsingEncoding: NSUTF8StringEncoding] - writeToFile: path atomically: useAuxiliaryFile]; + return [data writeToFile: path atomically: useAuxiliaryFile]; } /** @@ -767,18 +768,20 @@ compareIt(id o1, id o2, void* context) { NSDictionary *loc = GSUserDefaultsDictionaryRepresentation(); NSString *desc = nil; + NSData *data; if (GSMacOSXCompatiblePropertyLists() == YES) { GSPropertyListMake(self, loc, YES, NO, 2, &desc); + data = [desc dataUsingEncoding: NSUTF8StringEncoding]; } else { GSPropertyListMake(self, loc, NO, NO, 2, &desc); + data = [desc dataUsingEncoding: NSASCIIStringEncoding]; } - return [[desc dataUsingEncoding: NSUTF8StringEncoding] - writeToURL: url atomically: useAuxiliaryFile]; + return [data writeToURL: url atomically: useAuxiliaryFile]; } /**