github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-27 16:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't clobber existing object keys

Browse Source
This commit is contained in:
Jan-Piet Mens
2015-08-25 18:42:21 +02:00
parent b2f84eb55c
commit 1c1086d84e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util.c
+12 -9
View File
@@ -51,6 +51,8 @@ int json_copy_to_object(JsonNode * obj, JsonNode * object_or_array)
/* should we delete keys which already exist in `obj' ? */
json_foreach(node, object_or_array) {
if (json_find_member(obj, node->key) != NULL)
continue; /* Don't clobber existing keys */
if (obj->tag == JSON_OBJECT) {
if (node->tag == JSON_STRING)
json_append_member(obj, node->key, json_mkstring(node->string_));
@@ -94,15 +96,16 @@ int json_copy_from_file(JsonNode *obj, char *filename)
char *js_string;
JsonNode *node;
if ((js_string = slurp_file(filename, TRUE)) != NULL) {
if ((node = json_decode(js_string)) == NULL) {
fprintf(stderr, "json_copy_from_file can't decode JSON from %s\n", filename);
return (FALSE);
}
json_copy_to_object(obj, node);
json_delete(node);
free(js_string);
if ((js_string = slurp_file(filename, TRUE)) == NULL) {
return (FALSE);
}
if ((node = json_decode(js_string)) == NULL) {
fprintf(stderr, "json_copy_from_file can't decode JSON from %s\n", filename);
return (FALSE);
}
json_copy_to_object(obj, node);
json_delete(node);
return (TRUE);
}