External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: json: Use VIR_APPEND_ELEMENT in virJSONValueObjectAppend

Browse Source 
The function open-codes addition into an array. Use the helper instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-02-05 18:36:59 +01:00
parent 0ef161c88f
commit 17f160b288
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/virjson.c
View File

@ -611,7 +611,8 @@ virJSONValueObjectAppend(virJSONValuePtr object,
const char *key,
virJSONValuePtr value)
{
char *newkey;
virJSONObjectPair pair = { NULL, value };
int ret = -1;
if (object->type != VIR_JSON_TYPE_OBJECT) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -624,20 +625,14 @@ virJSONValueObjectAppend(virJSONValuePtr object,
return -1;
}
if (VIR_STRDUP(newkey, key) < 0)
if (VIR_STRDUP(pair.key, key) < 0)
return -1;
if (VIR_REALLOC_N(object->data.object.pairs,
object->data.object.npairs + 1) < 0) {
VIR_FREE(newkey);
return -1;
}
ret = VIR_APPEND_ELEMENT(object->data.object.pairs,
object->data.object.npairs, pair);
object->data.object.pairs[object->data.object.npairs].key = newkey;
object->data.object.pairs[object->data.object.npairs].value = value;
object->data.object.npairs++;
return 0;
VIR_FREE(pair.key);
return ret;
}