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

refactor cJSONUtils_GeneratePatch

Browse Source
This commit is contained in:
Max Bruckner 2017-04-30 13:12:57 +02:00
parent bde341edd8
commit e591d4173a
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cJSON_Utils.c
View File

@ -843,24 +843,35 @@ CJSON_PUBLIC(int) cJSONUtils_ApplyPatches(cJSON * const object, const cJSON * co
return 0; return 0;
} }
static void cJSONUtils_GeneratePatch(cJSON *patches, const unsigned char *op, const unsigned char *path, const unsigned char *suffix, cJSON *val) static void cJSONUtils_GeneratePatch(cJSON * const patches, const unsigned char * const operation, const unsigned char * const path, const unsigned char *suffix, const cJSON * const value)
{ {
cJSON *patch = cJSON_CreateObject(); cJSON *patch = cJSON_CreateObject();
cJSON_AddItemToObject(patch, "op", cJSON_CreateString((const char*)op)); if (patch == NULL)
if (suffix)
{ {
unsigned char *newpath = (unsigned char*)cJSON_malloc(strlen((const char*)path) + cJSONUtils_PointerEncodedstrlen(suffix) + 2); return;
cJSONUtils_PointerEncodedstrcpy(newpath + sprintf((char*)newpath, "%s/", (const char*)path), suffix);
cJSON_AddItemToObject(patch, "path", cJSON_CreateString((const char*)newpath));
free(newpath);
} }
else cJSON_AddItemToObject(patch, "op", cJSON_CreateString((const char*)operation));
if (suffix == NULL)
{ {
cJSON_AddItemToObject(patch, "path", cJSON_CreateString((const char*)path)); cJSON_AddItemToObject(patch, "path", cJSON_CreateString((const char*)path));
} }
if (val) else
{ {
cJSON_AddItemToObject(patch, "value", cJSON_Duplicate(val, 1)); size_t suffix_length = cJSONUtils_PointerEncodedstrlen(suffix);
size_t path_length = strlen((const char*)path);
unsigned char *full_path = (unsigned char*)cJSON_malloc(path_length + suffix_length + sizeof("/"));
sprintf((char*)full_path, "%s/", (const char*)path);
cJSONUtils_PointerEncodedstrcpy(full_path + path_length + 1, suffix);
cJSON_AddItemToObject(patch, "path", cJSON_CreateString((const char*)full_path));
free(full_path);
}
if (value != NULL)
{
cJSON_AddItemToObject(patch, "value", cJSON_Duplicate(value, 1));
} }
cJSON_AddItemToArray(patches, patch); cJSON_AddItemToArray(patches, patch);
} }