External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

util: json: Replace virJSONValueObjectSteal by virJSONValueObjectRemoveKey

Browse Source 
virJSONValueObjectRemoveKey can be used as direct replacement. Fix the
one caller and remove the duplicate function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-30 14:59:38 +01:00
parent 521aef329c
commit 45187ef384
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/util/virjson.c
View File

@ -883,30 +883,6 @@ virJSONValueObjectGet(virJSONValuePtr object,
} }
static virJSONValuePtr
virJSONValueObjectSteal(virJSONValuePtr object,
const char *key)
{
size_t i;
virJSONValuePtr obj = NULL;
if (object->type != VIR_JSON_TYPE_OBJECT)
return NULL;
for (i = 0; i < object->data.object.npairs; i++) {
if (STREQ(object->data.object.pairs[i].key, key)) {
obj = g_steal_pointer(&object->data.object.pairs[i].value);
VIR_FREE(object->data.object.pairs[i].key);
VIR_DELETE_ELEMENT(object->data.object.pairs, i,
object->data.object.npairs);
break;
}
}
return obj;
}
/* Return the value associated with KEY within OBJECT, but return NULL /* Return the value associated with KEY within OBJECT, but return NULL
* if the key is missing or if value is not the correct TYPE. */ * if the key is missing or if value is not the correct TYPE. */
virJSONValuePtr virJSONValuePtr
@ -929,7 +905,10 @@ virJSONValueObjectStealByType(virJSONValuePtr object,
const char *key, const char *key,
virJSONType type) virJSONType type)
{ {
virJSONValuePtr value = virJSONValueObjectSteal(object, key); virJSONValuePtr value;
if (virJSONValueObjectRemoveKey(object, key, &value) <= 0)
return NULL;
if (value && value->type == type) if (value && value->type == type)
return value; return value;