From 6ac9271fbca9c5378a2043dafd354aa653bbc146 Mon Sep 17 00:00:00 2001
From: Mingye Wang <arthur200126@gmail.com>
Date: Wed, 26 Feb 2020 19:22:19 +0800
Subject: [PATCH] use dataFromPropertyList for the addition

---
 Tools/NSPropertyList+PLUtil.m |  9 +++++----
 Tools/plutil.m                | 14 ++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Tools/NSPropertyList+PLUtil.m b/Tools/NSPropertyList+PLUtil.m
index 08d14a864..24cc1ca8e 100644
--- a/Tools/NSPropertyList+PLUtil.m
+++ b/Tools/NSPropertyList+PLUtil.m
@@ -54,12 +54,14 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
   NSError *     myError = nil;
   NSData *      dest;
   NSDictionary *loc;
+  loc = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
   switch (aFormat)
     {
     case NSPropertyListJSONFormat:
-      dest = [NSJSONSerialization dataWithJSONObject:aPropertyList
-					     options:NSJSONWritingPrettyPrinted
-					       error:&myError];
+      dest = [NSJSONSerialization
+	dataWithJSONObject:aPropertyList
+		   options:loc != nil ? NSJSONWritingPrettyPrinted : 0
+		     error:&myError];
       if (myError != nil && anErrorString != NULL)
 	{
 	  *anErrorString = [myError description];
@@ -67,7 +69,6 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
       return dest;
     case NSPropertyListObjectiveCFormat:
     case NSPropertyListSwiftFormat:
-      loc = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
       dest = [NSMutableData dataWithCapacity:1024];
       OAppend(aPropertyList, loc, 0, 2, aFormat, dest);
       return dest;
diff --git a/Tools/plutil.m b/Tools/plutil.m
index 67f632240..e618f4288 100644
--- a/Tools/plutil.m
+++ b/Tools/plutil.m
@@ -318,15 +318,17 @@ plFormatFromName(NSString *name)
 int
 dumpToFile(id obj, NSPropertyListFormat fmt, NSString *outfile)
 {
-  NSError *     anError;
+  NSString *    errorString = nil;
   NSFileHandle *fh;
-  NSData *      outdata = [NSPropertyListSerialization dataWithPropertyList:obj
-								     format:fmt
-								    options:0
-								      error:&anError];
+  NSData *      outdata =
+    [NSPropertyListSerialization dataFromPropertyList:obj
+					       format:fmt
+					      options:0
+				     errorDescription:&errorString];
   if (anError)
     {
-      GSPrintf(stderr, @"Dumping %@ as format %@ - %@\n", obj, fmt, anError);
+      GSPrintf(stderr, @"Dumping %@ as format %@ - %@\n", obj, fmt,
+	       errorString);
       return EXIT_FAILURE;
     }