aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2019-10-17 08:36:28 +0300
committerGitHub <noreply@github.com>2019-10-17 08:36:28 +0300
commit8b022dad76d44ea5ec01fdeffbd8214eeab88c19 (patch)
tree2038c1715eca99885847c12233aa114e6213fa56 /doc
parent0eec0327be5d6c488017177a589ee2996c701020 (diff)
parentfb602f331bb356aca4b2ec63c7db4da34773a381 (diff)
downloadjansson-8b022dad76d44ea5ec01fdeffbd8214eeab88c19.zip
jansson-8b022dad76d44ea5ec01fdeffbd8214eeab88c19.tar.gz
jansson-8b022dad76d44ea5ec01fdeffbd8214eeab88c19.tar.bz2
Merge pull request #505 from AllenX2018/recursive_object_update
Recursive object update
Diffstat (limited to 'doc')
-rw-r--r--doc/apiref.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/apiref.rst b/doc/apiref.rst
index eb4706a..f0aaf66 100644
--- a/doc/apiref.rst
+++ b/doc/apiref.rst
@@ -708,6 +708,12 @@ allowed in object keys.
.. versionadded:: 2.3
+.. function:: int json_object_update_recursive(json_t *object, json_t *other)
+
+ Like :func:`json_object_update()`, but object values in *other* are
+ recursively merged with the corresponding values in *object* if they are also
+ objects, instead of overwriting them. Returns 0 on success or -1 on error.
+
.. function:: json_object_foreach(object, key, value)
Iterate over every key-value pair of ``object``, running the block