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

Merge pull request #499 from AllenX2018/fix-issue281

Browse Source 
Add json_object_update_new, json_object_update_existing_new and json_object_update_missing_new
This commit is contained in:
Petri Lehtinen 2019-10-18 16:18:28 +03:00 committed by GitHub
commit f75dc840e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 105 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/apiref.rst
View File

@ -708,6 +708,24 @@ allowed in object keys.
.. versionadded:: 2.3
.. function:: int json_object_update_new(json_t *object, json_t *other)
Like :func:`json_object_update()`, but steals the reference to
*other*. This is useful when *other* is newly created and not used
after the call.
.. function:: int json_object_update_existing_new(json_t *object, json_t *other)
Like :func:`json_object_update_new()`, but only the values of existing
keys are updated. No new keys are created. Returns 0 on success or
-1 on error.
.. function:: int json_object_update_missing_new(json_t *object, json_t *other)
Like :func:`json_object_update_new()`, but only new keys are created.
The value of any existing key is not changed. Returns 0 on success
or -1 on error.
.. function:: int json_object_update_recursive(json_t *object, json_t *other)
Like :func:`json_object_update()`, but object values in *other* are

24
src/jansson.h
View File

@ -243,6 +243,30 @@ int json_object_iter_set(json_t *object, void *iter, json_t *value)
return json_object_iter_set_new(object, iter, json_incref(value));
}
static JSON_INLINE
int json_object_update_new(json_t *object, json_t *other)
{
int ret = json_object_update(object, other);
json_decref(other);
return ret;
}
static JSON_INLINE
int json_object_update_existing_new(json_t *object, json_t *other)
{
int ret = json_object_update_existing(object, other);
json_decref(other);
return ret;
}
static JSON_INLINE
int json_object_update_missing_new(json_t *object, json_t *other)
{
int ret = json_object_update_missing(object, other);
json_decref(other);
return ret;
}
size_t json_array_size(const json_t *array);
json_t *json_array_get(const json_t *array, size_t index) JANSSON_ATTRS((warn_unused_result));
int json_array_set_new(json_t *array, size_t index, json_t *value);

63
test/suites/api/test_object.c
View File

@ -133,6 +133,32 @@ static void test_update()
json_object_get(object, "h") != nine)
fail("update works incorrectly");
/* update_new check */
if(json_object_clear(object))
fail("clear failed");
if(json_object_set(object, "a", ten) ||
json_object_set(object, "b", ten) ||
json_object_set(object, "c", ten) ||
json_object_set(object, "d", ten) ||
json_object_set(object, "e", ten))
fail("unable to set value");
if(json_object_update_new(object, json_pack("{s:O, s:O, s:O}", "b", nine, "f", nine, "g", nine)))
fail("unable to update_new a nonempty object");
if(json_object_size(object) != 7)
fail("invalid size after update_new");
if(json_object_get(object, "a") != ten ||
json_object_get(object, "b") != nine ||
json_object_get(object, "c") != ten ||
json_object_get(object, "d") != ten ||
json_object_get(object, "e") != ten ||
json_object_get(object, "f") != nine ||
json_object_get(object, "g") != nine)
fail("update_new works incorrectly");
json_decref(nine);
json_decref(ten);
json_decref(other);
@ -186,6 +212,23 @@ static void test_conditional_updates()
json_decref(object);
/* json_object_update_existing_new check */
object = json_pack("{sisi}", "foo", 1, "bar", 2);
if(json_object_update_existing_new(object, json_pack("{sisi}", "foo", 3, "baz", 4)))
fail("json_object_update_existing_new failed");
if(json_object_size(object) != 2)
fail("json_object_update_existing_new added new items");
if(json_integer_value(json_object_get(object, "foo")) != 3)
fail("json_object_update_existing_new failed to update existing key");
if(json_integer_value(json_object_get(object, "bar")) != 2)
fail("json_object_update_existing_new updated wrong key");
json_decref(object);
object = json_pack("{sisi}", "foo", 1, "bar", 2);
if(json_object_update_missing(object, other))
@ -203,6 +246,26 @@ static void test_conditional_updates()
if(json_integer_value(json_object_get(object, "baz")) != 4)
fail("json_object_update_missing didn't add new items");
json_decref(object);
/* json_object_update_missing_new check */
object = json_pack("{sisi}", "foo", 1, "bar", 2);
if(json_object_update_missing_new(object, json_pack("{sisi}", "foo", 3, "baz", 4)))
fail("json_object_update_missing_new failed");
if(json_object_size(object) != 3)
fail("json_object_update_missing_new didn't add new items");
if(json_integer_value(json_object_get(object, "foo")) != 1)
fail("json_object_update_missing_new updated existing key");
if(json_integer_value(json_object_get(object, "bar")) != 2)
fail("json_object_update_missing_new updated wrong key");
if(json_integer_value(json_object_get(object, "baz")) != 4)
fail("json_object_update_missing_new didn't add new items");
json_decref(object);
json_decref(other);
}