From ce4b65a26d00892e50ae33d2415b8fe51eeb2ace Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 Sep 2020 16:57:09 +0800 Subject: [PATCH] plutil: make it build --- Tools/NSPropertyList+PLUtil.m | 22 ++-------------------- Tools/plutil.m | 4 ++-- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Tools/NSPropertyList+PLUtil.m b/Tools/NSPropertyList+PLUtil.m index 1ac96e2d4..f6d5bfa3f 100644 --- a/Tools/NSPropertyList+PLUtil.m +++ b/Tools/NSPropertyList+PLUtil.m @@ -31,23 +31,6 @@ static IMP originalRead = 0; static IMP originalWrite = 0; -// The whole PAppend and indent table thing again. Later? -static void -OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step, - NSPropertyListFormat x, NSMutableData *dest) -{ - // Generate declaration w/ type - if (lev == 0) - ; - - // Main loop - - // Add semicolon - if (lev == 0 && x == NSPropertyListObjectiveCFormat) - [dest appendBytes:";" length:1]; - [dest appendBytes:"\n" length:1]; -} - @implementation NSPropertyListSerialization (PLUtilAdditions) + (NSData *)_pdataFromPropertyList:(id)aPropertyList format:(NSPropertyListFormat)aFormat @@ -71,9 +54,8 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step, return dest; case NSPropertyListObjectiveCFormat: case NSPropertyListSwiftFormat: - dest = [NSMutableData dataWithCapacity:1024]; - OAppend(aPropertyList, loc, 0, 2, aFormat, dest); - return dest; + *anErrorString = @"Not implemented"; + return nil; default: return (*originalWrite)(self, _cmd, aPropertyList, aFormat, anErrorString); } diff --git a/Tools/plutil.m b/Tools/plutil.m index e618f4288..49f9a5746 100644 --- a/Tools/plutil.m +++ b/Tools/plutil.m @@ -32,7 +32,7 @@ #import "Foundation/NSString.h" #import "Foundation/NSUserDefaults.h" #import "Foundation/NSValue.h" -#import "NSPropertyList+PLutil.h" +#import "NSPropertyList+PLUtil.h" // From NSPropertyList.m extern void @@ -325,7 +325,7 @@ dumpToFile(id obj, NSPropertyListFormat fmt, NSString *outfile) format:fmt options:0 errorDescription:&errorString]; - if (anError) + if (errorString) { GSPrintf(stderr, @"Dumping %@ as format %@ - %@\n", obj, fmt, errorString);