Merge pull request #37 from DaveGamble/reformatting

Reformat cJSON_Utils.c and test.c

Merge pull request #37 from DaveGamble/reformatting
Reformat cJSON_Utils.c and test.c
a1c022fe · Max Bruckner · GitHub · 0c23e8dd · ddeca827 · a1c022fe
展开全部隐藏空白更改
内联并排

Showing with 1052 addition and 476 deletion

cJSON.c cJSON.c +1 -1

cJSON.h cJSON.h +5 -5

cJSON_Utils.c cJSON_Utils.c +753 -335

cJSON_Utils.h cJSON_Utils.h +29 -15

test.c test.c +264 -120

未找到文件。
--- a/cJSON.c
+++ b/cJSON.c
@@ -1722,7 +1722,7 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
        /* item doesn't exist */
        return 0;
    }
-	if (c->prev)
+    if (c->prev)
    {
        /* not the first element */
        c->prev->next = c->next;

--- a/cJSON.h
+++ b/cJSON.h
 /*
  Copyright (c) 2009 Dave Gamble
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,7 +36,7 @@ extern "C"
 #define cJSON_String (1 << 4)
 #define cJSON_Array  (1 << 5)
 #define cJSON_Object (1 << 6)
 #define cJSON_IsReference 256
 #define cJSON_StringIsConst 512
@@ -93,7 +93,7 @@ extern cJSON *cJSON_GetObjectItem(const cJSON *object, const char *string);
 extern int cJSON_HasObjectItem(const cJSON *object, const char *string);
 /* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
 extern const char *cJSON_GetErrorPtr(void);
 /* These calls create a cJSON item of the appropriate type. */
 extern cJSON *cJSON_CreateNull(void);
 extern cJSON *cJSON_CreateTrue(void);

--- a/cJSON_Utils.c
+++ b/cJSON_Utils.c
--- a/cJSON_Utils.h
+++ b/cJSON_Utils.h
 #include "cJSON.h"
-/* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec.	*/
+/* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec. */
-cJSON *cJSONUtils_GetPointer(cJSON *object,const char *pointer);
+cJSON *cJSONUtils_GetPointer(cJSON *object, const char *pointer);
-/* Implement RFC6902 (https://tools.ietf.org/html/rfc6902) JSON Patch spec.		*/
+/* Implement RFC6902 (https://tools.ietf.org/html/rfc6902) JSON Patch spec. */
-cJSON* cJSONUtils_GeneratePatches(cJSON *from,cJSON *to);
+cJSON* cJSONUtils_GeneratePatches(cJSON *from, cJSON *to);
-void cJSONUtils_AddPatchToArray(cJSON *array,const char *op,const char *path,cJSON *val);	/* Utility for generating patch array entries.	*/
+/* Utility for generating patch array entries. */
-int cJSONUtils_ApplyPatches(cJSON *object,cJSON *patches);	/* Returns 0 for success. */
+void cJSONUtils_AddPatchToArray(cJSON *array, const char *op, const char *path, cJSON *val);
+/* Returns 0 for success. */
+int cJSONUtils_ApplyPatches(cJSON *object, cJSON *patches);
 /*
 // Note that ApplyPatches is NOT atomic on failure. To implement an atomic ApplyPatches, use:
 //int cJSONUtils_AtomicApplyPatches(cJSON **object, cJSON *patches)
 //{
-//	cJSON *modme=cJSON_Duplicate(*object,1);
+//    cJSON *modme = cJSON_Duplicate(*object, 1);
-//	int error=cJSONUtils_ApplyPatches(modme,patches);
+//    int error = cJSONUtils_ApplyPatches(modme, patches);
-//	if (!error)	{cJSON_Delete(*object);*object=modme;}
+//    if (!error)
-//	else		cJSON_Delete(modme);
+//    {
-//	return error;
+//        cJSON_Delete(*object);
+//        *object = modme;
+//    }
+//    else
+//    {
+//        cJSON_Delete(modme);
+//    }
+//
+//    return error;
 //}
 // Code not added to library since this strategy is a LOT slower.
 */
 /* Implement RFC7386 (https://tools.ietf.org/html/rfc7396) JSON Merge Patch spec. */
-cJSON* cJSONUtils_MergePatch(cJSON *target, cJSON *patch); /* target will be modified by patch. return value is new ptr for target. */
+/* target will be modified by patch. return value is new ptr for target. */
-cJSON *cJSONUtils_GenerateMergePatch(cJSON *from,cJSON *to); /* generates a patch to move from -> to */
+cJSON* cJSONUtils_MergePatch(cJSON *target, cJSON *patch);
+/* generates a patch to move from -> to */
+cJSON *cJSONUtils_GenerateMergePatch(cJSON *from, cJSON *to);
-char *cJSONUtils_FindPointerFromObjectTo(cJSON *object,cJSON *target);	/* Given a root object and a target object, construct a pointer from one to the other.	*/
+/* Given a root object and a target object, construct a pointer from one to the other. */
+char *cJSONUtils_FindPointerFromObjectTo(cJSON *object, cJSON *target);
-void cJSONUtils_SortObject(cJSON *object);	/* Sorts the members of the object into alphabetical order.	*/
+/* Sorts the members of the object into alphabetical order. */
+void cJSONUtils_SortObject(cJSON *object);
--- a/test.c
+++ b/test.c
@@ -27,125 +27,269 @@
 /* Parse text to JSON, then render back to text, and print! */
 void doit(char *text)
 {
-	char *out;cJSON *json;
+    char *out;
+    cJSON *json;
-	json=cJSON_Parse(text);
-	if (!json) {printf("Error before: [%s]\n",cJSON_GetErrorPtr());}
+    json = cJSON_Parse(text);
-	else
+    if (!json)
-	{
+    {
-		out=cJSON_Print(json);
+        printf("Error before: [%s]\n", cJSON_GetErrorPtr());
-		cJSON_Delete(json);
+    }
-		printf("%s\n",out);
+    else
-		free(out);
+    {
-	}
+        out = cJSON_Print(json);
+        cJSON_Delete(json);
+        printf("%s\n", out);
+        free(out);
+    }
 }
 /* Read a file, parse, render back, etc. */
 void dofile(char *filename)
 {
-	FILE *f;long len;char *data;
+    FILE *f;
+    long len;
+    char *data;
-	f=fopen(filename,"rb");fseek(f,0,SEEK_END);len=ftell(f);fseek(f,0,SEEK_SET);
+    /* open in read binary mode */
-	data=(char*)malloc(len+1);fread(data,1,len,f);data[len]='\0';fclose(f);
+    f = fopen(filename,"rb");
-	doit(data);
+    /* get the length */
-	free(data);
+    fseek(f, 0, SEEK_END);
+    len = ftell(f);
+    fseek(f, 0, SEEK_SET);
+    data = (char*)malloc(len + 1);
+    fread(data, 1, len, f);
+    data[len] = '\0';
+    fclose(f);
+    doit(data);
+    free(data);
 }
 /* Used by some code below as an example datatype. */
-struct record {const char *precision;double lat,lon;const char *address,*city,*state,*zip,*country; };
+struct record
+{
+    const char *precision;
+    double lat;
+    double lon;
+    const char *address;
+    const char *city;
+    const char *state;
+    const char *zip;
+    const char *country;
+};
 /* Create a bunch of objects as demonstration. */
 void create_objects()
 {
-	cJSON *root,*fmt,*img,*thm,*fld;char *out;int i;	/* declare a few. */
+    /* declare a few. */
-	/* Our "days of the week" array: */
+    cJSON *root;
-	const char *strings[7]={"Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"};
+    cJSON *fmt;
-	/* Our matrix: */
+    cJSON *img;
-	int numbers[3][3]={{0,-1,0},{1,0,0},{0,0,1}};
+    cJSON *thm;
-	/* Our "gallery" item: */
+    cJSON *fld;
-	int ids[4]={116,943,234,38793};
+    char *out;
-	/* Our array of "records": */
+    int i;
-	struct record fields[2]={
-		{"zip",37.7668,-1.223959e+2,"","SAN FRANCISCO","CA","94107","US"},
+    /* Our "days of the week" array: */
-		{"zip",37.371991,-1.22026e+2,"","SUNNYVALE","CA","94085","US"}};
+    const char *strings[7] =
-	volatile double zero = 0.0;
+    {
+        "Sunday",
-	/* Here we construct some JSON standards, from the JSON site. */
+        "Monday",
+        "Tuesday",
-	/* Our "Video" datatype: */
+        "Wednesday",
-	root=cJSON_CreateObject();
+        "Thursday",
-	cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
+        "Friday",
-	cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject());
+        "Saturday"
-	cJSON_AddStringToObject(fmt,"type",		"rect");
+    };
-	cJSON_AddNumberToObject(fmt,"width",		1920);
+    /* Our matrix: */
-	cJSON_AddNumberToObject(fmt,"height",		1080);
+    int numbers[3][3] =
-	cJSON_AddFalseToObject (fmt,"interlace");
+    {
-	cJSON_AddNumberToObject(fmt,"frame rate",	24);
+        {0, -1, 0},
+        {1, 0, 0},
-	out=cJSON_Print(root);	cJSON_Delete(root);	printf("%s\n",out);	free(out);	/* Print to text, Delete the cJSON, print it, release the string. */
+        {0 ,0, 1}
+    };
-	/* Our "days of the week" array: */
+    /* Our "gallery" item: */
-	root=cJSON_CreateStringArray(strings,7);
+    int ids[4] = { 116, 943, 234, 38793 };
+    /* Our array of "records": */
-	out=cJSON_Print(root);	cJSON_Delete(root);	printf("%s\n",out);	free(out);
+    struct record fields[2] =
+    {
-	/* Our matrix: */
+        {
-	root=cJSON_CreateArray();
+            "zip",
-	for (i=0;i<3;i++) cJSON_AddItemToArray(root,cJSON_CreateIntArray(numbers[i],3));
+            37.7668,
+            -1.223959e+2,
-/*	cJSON_ReplaceItemInArray(root,1,cJSON_CreateString("Replacement")); */
+            "",
+            "SAN FRANCISCO",
-	out=cJSON_Print(root);	cJSON_Delete(root);	printf("%s\n",out);	free(out);
+            "CA",
+            "94107",
+            "US"
-	/* Our "gallery" item: */
+        },
-	root=cJSON_CreateObject();
+        {
-	cJSON_AddItemToObject(root, "Image", img=cJSON_CreateObject());
+            "zip",
-	cJSON_AddNumberToObject(img,"Width",800);
+            37.371991,
-	cJSON_AddNumberToObject(img,"Height",600);
+            -1.22026e+2,
-	cJSON_AddStringToObject(img,"Title","View from 15th Floor");
+            "",
-	cJSON_AddItemToObject(img, "Thumbnail", thm=cJSON_CreateObject());
+            "SUNNYVALE",
-	cJSON_AddStringToObject(thm, "Url", "http:/*www.example.com/image/481989943");
+            "CA",
-	cJSON_AddNumberToObject(thm,"Height",125);
+            "94085",
-	cJSON_AddStringToObject(thm,"Width","100");
+            "US"
-	cJSON_AddItemToObject(img,"IDs", cJSON_CreateIntArray(ids,4));
+        }
+    };
-	out=cJSON_Print(root);	cJSON_Delete(root);	printf("%s\n",out);	free(out);
+    volatile double zero = 0.0;
-	/* Our array of "records": */
+    /* Here we construct some JSON standards, from the JSON site. */
-	root=cJSON_CreateArray();
+    /* Our "Video" datatype: */
-	for (i=0;i<2;i++)
+    root = cJSON_CreateObject();
-	{
+    cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
-		cJSON_AddItemToArray(root,fld=cJSON_CreateObject());
+    cJSON_AddItemToObject(root, "format", fmt = cJSON_CreateObject());
-		cJSON_AddStringToObject(fld, "precision", fields[i].precision);
+    cJSON_AddStringToObject(fmt, "type", "rect");
-		cJSON_AddNumberToObject(fld, "Latitude", fields[i].lat);
+    cJSON_AddNumberToObject(fmt, "width", 1920);
-		cJSON_AddNumberToObject(fld, "Longitude", fields[i].lon);
+    cJSON_AddNumberToObject(fmt, "height", 1080);
-		cJSON_AddStringToObject(fld, "Address", fields[i].address);
+    cJSON_AddFalseToObject (fmt, "interlace");
-		cJSON_AddStringToObject(fld, "City", fields[i].city);
+    cJSON_AddNumberToObject(fmt, "frame rate", 24);
-		cJSON_AddStringToObject(fld, "State", fields[i].state);
-		cJSON_AddStringToObject(fld, "Zip", fields[i].zip);
+    /* Print to text */
-		cJSON_AddStringToObject(fld, "Country", fields[i].country);
+    out = cJSON_Print(root);
-	}
+    /* Delete the cJSON */
+    cJSON_Delete(root);
-/*	cJSON_ReplaceItemInObject(cJSON_GetArrayItem(root,1),"City",cJSON_CreateIntArray(ids,4)); */
+    /* print it */
+    printf("%s\n",out);
-	out=cJSON_Print(root);	cJSON_Delete(root);	printf("%s\n",out);	free(out);
+    /* release the string */
+    free(out);
-	root=cJSON_CreateObject();
-	cJSON_AddNumberToObject(root,"number", 1.0/zero);
+    /* Our "days of the week" array: */
-	out=cJSON_Print(root);	cJSON_Delete(root);	printf("%s\n",out);	free(out);
+    root = cJSON_CreateStringArray(strings, 7);
+    out = cJSON_Print(root);
+    cJSON_Delete(root);
+    printf("%s\n", out);
+    free(out);
+    /* Our matrix: */
+    root = cJSON_CreateArray();
+    for (i = 0; i < 3; i++)
+    {
+        cJSON_AddItemToArray(root, cJSON_CreateIntArray(numbers[i], 3));
+    }
+    /* cJSON_ReplaceItemInArray(root, 1, cJSON_CreateString("Replacement")); */
+    out = cJSON_Print(root);
+    cJSON_Delete(root);
+    printf("%s\n", out);
+    free(out);
+    /* Our "gallery" item: */
+    root = cJSON_CreateObject();
+    cJSON_AddItemToObject(root, "Image", img = cJSON_CreateObject());
+    cJSON_AddNumberToObject(img, "Width", 800);
+    cJSON_AddNumberToObject(img, "Height", 600);
+    cJSON_AddStringToObject(img, "Title", "View from 15th Floor");
+    cJSON_AddItemToObject(img, "Thumbnail", thm = cJSON_CreateObject());
+    cJSON_AddStringToObject(thm, "Url", "http:/*www.example.com/image/481989943");
+    cJSON_AddNumberToObject(thm, "Height", 125);
+    cJSON_AddStringToObject(thm, "Width", "100");
+    cJSON_AddItemToObject(img, "IDs", cJSON_CreateIntArray(ids, 4));
+    out = cJSON_Print(root);
+    cJSON_Delete(root);
+    printf("%s\n", out);
+    free(out);
+    /* Our array of "records": */
+    root = cJSON_CreateArray();
+    for (i = 0; i < 2; i++)
+    {
+        cJSON_AddItemToArray(root, fld = cJSON_CreateObject());
+        cJSON_AddStringToObject(fld, "precision", fields[i].precision);
+        cJSON_AddNumberToObject(fld, "Latitude", fields[i].lat);
+        cJSON_AddNumberToObject(fld, "Longitude", fields[i].lon);
+        cJSON_AddStringToObject(fld, "Address", fields[i].address);
+        cJSON_AddStringToObject(fld, "City", fields[i].city);
+        cJSON_AddStringToObject(fld, "State", fields[i].state);
+        cJSON_AddStringToObject(fld, "Zip", fields[i].zip);
+        cJSON_AddStringToObject(fld, "Country", fields[i].country);
+    }
+    /* cJSON_ReplaceItemInObject(cJSON_GetArrayItem(root, 1), "City", cJSON_CreateIntArray(ids, 4)); */
+    out = cJSON_Print(root);
+    cJSON_Delete(root);
+    printf("%s\n", out);
+    free(out);
+    root = cJSON_CreateObject();
+    cJSON_AddNumberToObject(root, "number", 1.0 / zero);
+    out = cJSON_Print(root);
+    cJSON_Delete(root);
+    printf("%s\n", out);
+    free(out);
 }
-int main (int argc, const char * argv[]) {
+int main (int argc, const char *argv[])
-	/* a bunch of json: */
+{
-	char text1[]="{\n\"name\": \"Jack (\\\"Bee\\\") Nimble\", \n\"format\": {\"type\":       \"rect\", \n\"width\":      1920, \n\"height\":     1080, \n\"interlace\":  false,\"frame rate\": 24\n}\n}";
+    /* a bunch of json: */
-	char text2[]="[\"Sunday\", \"Monday\", \"Tuesday\", \"Wednesday\", \"Thursday\", \"Friday\", \"Saturday\"]";
+    char text1[] =
-	char text3[]="[\n    [0, -1, 0],\n    [1, 0, 0],\n    [0, 0, 1]\n	]\n";
+        "{\n"
-	char text4[]="{\n		\"Image\": {\n			\"Width\":  800,\n			\"Height\": 600,\n			\"Title\":  \"View from 15th Floor\",\n			\"Thumbnail\": {\n				\"Url\":    \"http:/*www.example.com/image/481989943\",\n				\"Height\": 125,\n				\"Width\":  \"100\"\n			},\n			\"IDs\": [116, 943, 234, 38793]\n		}\n	}";
+        "\"name\": \"Jack (\\\"Bee\\\") Nimble\", \n"
-	char text5[]="[\n	 {\n	 \"precision\": \"zip\",\n	 \"Latitude\":  37.7668,\n	 \"Longitude\": -122.3959,\n	 \"Address\":   \"\",\n	 \"City\":      \"SAN FRANCISCO\",\n	 \"State\":     \"CA\",\n	 \"Zip\":       \"94107\",\n	 \"Country\":   \"US\"\n	 },\n	 {\n	 \"precision\": \"zip\",\n	 \"Latitude\":  37.371991,\n	 \"Longitude\": -122.026020,\n	 \"Address\":   \"\",\n	 \"City\":      \"SUNNYVALE\",\n	 \"State\":     \"CA\",\n	 \"Zip\":       \"94085\",\n	 \"Country\":   \"US\"\n	 }\n	 ]";
+        "\"format\": {\"type\":       \"rect\", \n"
+        "\"width\":      1920, \n"
-    char text6[] = "<!DOCTYPE html>"
+        "\"height\":     1080, \n"
+        "\"interlace\":  false,\"frame rate\": 24\n"
+        "}\n"
+        "}";
+    char text2[] = "[\"Sunday\", \"Monday\", \"Tuesday\", \"Wednesday\", \"Thursday\", \"Friday\", \"Saturday\"]";
+    char text3[] =
+        "[\n"
+        "    [0, -1, 0],\n"
+        "    [1, 0, 0],\n"
+        "    [0, 0, 1]\n"
+        "\t]\n";
+    char text4[] =
+        "{\n"
+        "\t\t\"Image\": {\n"
+        "\t\t\t\"Width\":  800,\n"
+        "\t\t\t\"Height\": 600,\n"
+        "\t\t\t\"Title\":  \"View from 15th Floor\",\n"
+        "\t\t\t\"Thumbnail\": {\n"
+        "\t\t\t\t\"Url\":    \"http:/*www.example.com/image/481989943\",\n"
+        "\t\t\t\t\"Height\": 125,\n"
+        "\t\t\t\t\"Width\":  \"100\"\n"
+        "\t\t\t},\n"
+        "\t\t\t\"IDs\": [116, 943, 234, 38793]\n"
+        "\t\t}\n"
+        "\t}";
+    char text5[] =
+        "[\n"
+        "\t {\n"
+        "\t \"precision\": \"zip\",\n"
+        "\t \"Latitude\":  37.7668,\n"
+        "\t \"Longitude\": -122.3959,\n"
+        "\t \"Address\":   \"\",\n"
+        "\t \"City\":      \"SAN FRANCISCO\",\n"
+        "\t \"State\":     \"CA\",\n"
+        "\t \"Zip\":       \"94107\",\n"
+        "\t \"Country\":   \"US\"\n"
+        "\t },\n"
+        "\t {\n"
+        "\t \"precision\": \"zip\",\n"
+        "\t \"Latitude\":  37.371991,\n"
+        "\t \"Longitude\": -122.026020,\n"
+        "\t \"Address\":   \"\",\n"
+        "\t \"City\":      \"SUNNYVALE\",\n"
+        "\t \"State\":     \"CA\",\n"
+        "\t \"Zip\":       \"94085\",\n"
+        "\t \"Country\":   \"US\"\n"
+        "\t }\n"
+        "\t ]";
+    char text6[] =
+        "<!DOCTYPE html>"
        "<html>\n"
        "<head>\n"
        "  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n"
@@ -162,24 +306,24 @@ int main (int argc, const char * argv[]) {
        "</body>\n"
        "</html>\n";
-	/* Process each json textblock by parsing, then rebuilding: */
+    /* Process each json textblock by parsing, then rebuilding: */
-	doit(text1);
+    doit(text1);
-	doit(text2);
+    doit(text2);
-	doit(text3);
+    doit(text3);
-	doit(text4);
+    doit(text4);
-	doit(text5);
+    doit(text5);
    doit(text6);
-	/* Parse standard testfiles: */
+    /* Parse standard testfiles: */
-/*	dofile("../../tests/test1"); */
+    /* dofile("../../tests/test1"); */
-/*	dofile("../../tests/test2"); */
+    /* dofile("../../tests/test2"); */
-/*	dofile("../../tests/test3"); */
+    /* dofile("../../tests/test3"); */
-/*	dofile("../../tests/test4"); */
+    /* dofile("../../tests/test4"); */
-/*	dofile("../../tests/test5"); */
+    /* dofile("../../tests/test5"); */
-/*	dofile("../../tests/test6"); */
+    /* dofile("../../tests/test6"); */
-	/* Now some samplecode for building objects concisely: */
+    /* Now some samplecode for building objects concisely: */
-	create_objects();
+    create_objects();
-	return 0;
+    return 0;
 }