FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add json_object_update_{existing,missing}

Browse Source 
Closes #37.
This commit is contained in:
Petri Lehtinen
2012-01-24 21:03:36 +02:00
parent a307974731
commit fa268b5017
5 changed files with 95 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jansson.h
View File

@@ -130,6 +130,8 @@ int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
int json_object_del(json_t *object, const char *key);
int json_object_clear(json_t *object);
int json_object_update(json_t *object, json_t *other);
int json_object_update_existing(json_t *object, json_t *other);
int json_object_update_missing(json_t *object, json_t *other);
void *json_object_iter(json_t *object);
void *json_object_iter_at(json_t *object, const char *key);
void *json_object_key_to_iter(const char *key);

32
src/value.c
View File

@@ -149,6 +149,38 @@ int json_object_update(json_t *object, json_t *other)
return 0;
}
int json_object_update_existing(json_t *object, json_t *other)
{
const char *key;
json_t *value;
if(!json_is_object(object) || !json_is_object(other))
return -1;
json_object_foreach(other, key, value) {
if(json_object_get(object, key))
json_object_set_nocheck(object, key, value);
}
return 0;
}
int json_object_update_missing(json_t *object, json_t *other)
{
const char *key;
json_t *value;
if(!json_is_object(object) || !json_is_object(other))
return -1;
json_object_foreach(other, key, value) {
if(!json_object_get(object, key))
json_object_set_nocheck(object, key, value);
}
return 0;
}
void *json_object_iter(json_t *json)
{
json_object_t *object;