mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37 from DaveGamble/reformatting

Browse Source 
Reformat cJSON_Utils.c and test.c
This commit is contained in:
Max Bruckner 2016-10-29 22:52:55 +07:00 committed by GitHub
commit a1c022fef6
5 changed files with 1018 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cJSON.c
View File

@ -1722,7 +1722,7 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
/* item doesn't exist */ /* item doesn't exist */
return 0; return 0;
} }
if (c->prev) if (c->prev)
{ {
/* not the first element */ /* not the first element */
c->prev->next = c->next; c->prev->next = c->next;

1050
cJSON_Utils.c
View File

File diff suppressed because it is too large Load Diff

44
cJSON_Utils.h
View File

@ -1,30 +1,44 @@
#include "cJSON.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: // Note that ApplyPatches is NOT atomic on failure. To implement an atomic ApplyPatches, use:
//int cJSONUtils_AtomicApplyPatches(cJSON **object, cJSON *patches) //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. // Code not added to library since this strategy is a LOT slower.
*/ */
/* Implement RFC7386 (https://tools.ietf.org/html/rfc7396) JSON Merge Patch spec. */ /* 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);

348
test.c
View File

@ -27,125 +27,269 @@
/* Parse text to JSON, then render back to text, and print! */ /* Parse text to JSON, then render back to text, and print! */
void doit(char *text) void doit(char *text)
{ {
char *out;cJSON *json; char *out;
cJSON *json;
json=cJSON_Parse(text); json = cJSON_Parse(text);
if (!json) {printf("Error before: [%s]\n",cJSON_GetErrorPtr());} if (!json)
else {
{ printf("Error before: [%s]\n", cJSON_GetErrorPtr());
out=cJSON_Print(json); }
cJSON_Delete(json); else
printf("%s\n",out); {
free(out); out = cJSON_Print(json);
} cJSON_Delete(json);
printf("%s\n", out);
free(out);
}
} }
/* Read a file, parse, render back, etc. */ /* Read a file, parse, render back, etc. */
void dofile(char *filename) 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. */ /* 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. */ /* Create a bunch of objects as demonstration. */
void create_objects() 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"},
{"zip",37.371991,-1.22026e+2,"","SUNNYVALE","CA","94085","US"}};
volatile double zero = 0.0;
/* Here we construct some JSON standards, from the JSON site. */ /* Our "days of the week" array: */
const char *strings[7] =
{
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday"
};
/* Our matrix: */
int numbers[3][3] =
{
{0, -1, 0},
{1, 0, 0},
{0 ,0, 1}
};
/* Our "gallery" item: */
int ids[4] = { 116, 943, 234, 38793 };
/* Our array of "records": */
struct record fields[2] =
{
{
"zip",
37.7668,
-1.223959e+2,
"",
"SAN FRANCISCO",
"CA",
"94107",
"US"
},
{
"zip",
37.371991,
-1.22026e+2,
"",
"SUNNYVALE",
"CA",
"94085",
"US"
}
};
volatile double zero = 0.0;
/* Our "Video" datatype: */ /* Here we construct some JSON standards, from the JSON site. */
root=cJSON_CreateObject();
cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject());
cJSON_AddStringToObject(fmt,"type", "rect");
cJSON_AddNumberToObject(fmt,"width", 1920);
cJSON_AddNumberToObject(fmt,"height", 1080);
cJSON_AddFalseToObject (fmt,"interlace");
cJSON_AddNumberToObject(fmt,"frame rate", 24);
out=cJSON_Print(root); cJSON_Delete(root); printf("%s\n",out); free(out); /* Print to text, Delete the cJSON, print it, release the string. */ /* Our "Video" datatype: */
root = cJSON_CreateObject();
cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
cJSON_AddItemToObject(root, "format", fmt = cJSON_CreateObject());
cJSON_AddStringToObject(fmt, "type", "rect");
cJSON_AddNumberToObject(fmt, "width", 1920);
cJSON_AddNumberToObject(fmt, "height", 1080);
cJSON_AddFalseToObject (fmt, "interlace");
cJSON_AddNumberToObject(fmt, "frame rate", 24);
/* Our "days of the week" array: */ /* Print to text */
root=cJSON_CreateStringArray(strings,7); out = cJSON_Print(root);
/* Delete the cJSON */
cJSON_Delete(root);
/* print it */
printf("%s\n",out);
/* release the string */
free(out);
out=cJSON_Print(root); cJSON_Delete(root); printf("%s\n",out); free(out); /* Our "days of the week" array: */
root = cJSON_CreateStringArray(strings, 7);
/* Our matrix: */ out = cJSON_Print(root);
root=cJSON_CreateArray(); cJSON_Delete(root);
for (i=0;i<3;i++) cJSON_AddItemToArray(root,cJSON_CreateIntArray(numbers[i],3)); printf("%s\n", out);
free(out);
/* cJSON_ReplaceItemInArray(root,1,cJSON_CreateString("Replacement")); */ /* Our matrix: */
root = cJSON_CreateArray();
for (i = 0; i < 3; i++)
{
cJSON_AddItemToArray(root, cJSON_CreateIntArray(numbers[i], 3));
}
out=cJSON_Print(root); cJSON_Delete(root); printf("%s\n",out); free(out); /* cJSON_ReplaceItemInArray(root, 1, cJSON_CreateString("Replacement")); */
out = cJSON_Print(root);
cJSON_Delete(root);
printf("%s\n", out);
free(out);
/* Our "gallery" item: */ /* Our "gallery" item: */
root=cJSON_CreateObject(); root = cJSON_CreateObject();
cJSON_AddItemToObject(root, "Image", img=cJSON_CreateObject()); cJSON_AddItemToObject(root, "Image", img = cJSON_CreateObject());
cJSON_AddNumberToObject(img,"Width",800); cJSON_AddNumberToObject(img, "Width", 800);
cJSON_AddNumberToObject(img,"Height",600); cJSON_AddNumberToObject(img, "Height", 600);
cJSON_AddStringToObject(img,"Title","View from 15th Floor"); cJSON_AddStringToObject(img, "Title", "View from 15th Floor");
cJSON_AddItemToObject(img, "Thumbnail", thm=cJSON_CreateObject()); cJSON_AddItemToObject(img, "Thumbnail", thm = cJSON_CreateObject());
cJSON_AddStringToObject(thm, "Url", "http:/*www.example.com/image/481989943"); cJSON_AddStringToObject(thm, "Url", "http:/*www.example.com/image/481989943");
cJSON_AddNumberToObject(thm,"Height",125); cJSON_AddNumberToObject(thm, "Height", 125);
cJSON_AddStringToObject(thm,"Width","100"); cJSON_AddStringToObject(thm, "Width", "100");
cJSON_AddItemToObject(img,"IDs", cJSON_CreateIntArray(ids,4)); cJSON_AddItemToObject(img, "IDs", cJSON_CreateIntArray(ids, 4));
out=cJSON_Print(root); cJSON_Delete(root); printf("%s\n",out); free(out); out = cJSON_Print(root);
cJSON_Delete(root);
printf("%s\n", out);
free(out);
/* Our array of "records": */ /* Our array of "records": */
root=cJSON_CreateArray(); root = cJSON_CreateArray();
for (i=0;i<2;i++) for (i = 0; i < 2; i++)
{ {
cJSON_AddItemToArray(root,fld=cJSON_CreateObject()); cJSON_AddItemToArray(root, fld = cJSON_CreateObject());
cJSON_AddStringToObject(fld, "precision", fields[i].precision); cJSON_AddStringToObject(fld, "precision", fields[i].precision);
cJSON_AddNumberToObject(fld, "Latitude", fields[i].lat); cJSON_AddNumberToObject(fld, "Latitude", fields[i].lat);
cJSON_AddNumberToObject(fld, "Longitude", fields[i].lon); cJSON_AddNumberToObject(fld, "Longitude", fields[i].lon);
cJSON_AddStringToObject(fld, "Address", fields[i].address); cJSON_AddStringToObject(fld, "Address", fields[i].address);
cJSON_AddStringToObject(fld, "City", fields[i].city); cJSON_AddStringToObject(fld, "City", fields[i].city);
cJSON_AddStringToObject(fld, "State", fields[i].state); cJSON_AddStringToObject(fld, "State", fields[i].state);
cJSON_AddStringToObject(fld, "Zip", fields[i].zip); cJSON_AddStringToObject(fld, "Zip", fields[i].zip);
cJSON_AddStringToObject(fld, "Country", fields[i].country); cJSON_AddStringToObject(fld, "Country", fields[i].country);
} }
/* cJSON_ReplaceItemInObject(cJSON_GetArrayItem(root,1),"City",cJSON_CreateIntArray(ids,4)); */ /* cJSON_ReplaceItemInObject(cJSON_GetArrayItem(root, 1), "City", cJSON_CreateIntArray(ids, 4)); */
out=cJSON_Print(root); cJSON_Delete(root); printf("%s\n",out); free(out); out = cJSON_Print(root);
cJSON_Delete(root);
printf("%s\n", out);
free(out);
root=cJSON_CreateObject(); root = cJSON_CreateObject();
cJSON_AddNumberToObject(root,"number", 1.0/zero); cJSON_AddNumberToObject(root, "number", 1.0 / zero);
out=cJSON_Print(root); cJSON_Delete(root); printf("%s\n",out); free(out); 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"
"\"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>" char text6[] =
"<!DOCTYPE html>"
"<html>\n" "<html>\n"
"<head>\n" "<head>\n"
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\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" "</body>\n"
"</html>\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); 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;
} }