External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-25 22:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: json: Add option to skip adding a JSON object if it is NULL

Browse Source 
Add a new option specifier that will optionally add a JSON key=value pair
containing a nested object if the added object isn't NULL.
This commit is contained in:
Peter Krempa 2014-10-15 09:41:49 +02:00
parent 81069ae3f5
commit ddf52d01f8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/virjson.c
View File

@ -99,6 +99,7 @@ struct _virJSONParser {
* n: json null value * n: json null value
* *
* a: json object, must be non-NULL * a: json object, must be non-NULL
* A: json object, omitted if NULL
* *
* The value corresponds to the selected type. * The value corresponds to the selected type.
* *
@ -230,10 +231,14 @@ virJSONValueObjectCreateVArgs(virJSONValuePtr *obj, va_list args)
rc = virJSONValueObjectAppendNull(jargs, key); rc = virJSONValueObjectAppendNull(jargs, key);
} break; } break;
case 'A':
case 'a': { case 'a': {
virJSONValuePtr val = va_arg(args, virJSONValuePtr); virJSONValuePtr val = va_arg(args, virJSONValuePtr);
if (!val) { if (!val) {
if (type == 'A')
continue;
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("argument key '%s' must not have null value"), _("argument key '%s' must not have null value"),
key); key);