External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: json: Introduce helper to prepend string into a virJSONValueObject

Browse Source 
Libvirt treats the JSON objects as lists thus the values appear in the
order they were added. To avoid too much changes introduce a helper
which allows to prepend a string which will allow to keep certain
outputs in order.

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:45:05 +01:00
parent 13f59e6f40
commit 12a330b50c
3 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -2244,6 +2244,7 @@ virJSONValueObjectGetValue;
virJSONValueObjectHasKey;
virJSONValueObjectIsNull;
virJSONValueObjectKeysNumber;
virJSONValueObjectPrependString;
virJSONValueObjectRemoveKey;
virJSONValueObjectStealArray;
virJSONValueObjectStealObject;

60
src/util/virjson.c
View File

@ -606,10 +606,11 @@ virJSONValueNewObject(void)
}
int
virJSONValueObjectAppend(virJSONValuePtr object,
static int
virJSONValueObjectInsert(virJSONValuePtr object,
const char *key,
virJSONValuePtr value)
virJSONValuePtr value,
bool prepend)
{
virJSONObjectPair pair = { NULL, value };
int ret = -1;
@ -628,27 +629,60 @@ virJSONValueObjectAppend(virJSONValuePtr object,
if (VIR_STRDUP(pair.key, key) < 0)
return -1;
ret = VIR_APPEND_ELEMENT(object->data.object.pairs,
object->data.object.npairs, pair);
if (prepend) {
ret = VIR_INSERT_ELEMENT(object->data.object.pairs, 0,
object->data.object.npairs, pair);
} else {
ret = VIR_APPEND_ELEMENT(object->data.object.pairs,
object->data.object.npairs, pair);
}
VIR_FREE(pair.key);
return ret;
}
int
virJSONValueObjectAppend(virJSONValuePtr object,
const char *key,
virJSONValuePtr value)
{
return virJSONValueObjectInsert(object, key, value, false);
}
static int
virJSONValueObjectInsertString(virJSONValuePtr object,
const char *key,
const char *value,
bool prepend)
{
virJSONValuePtr jvalue = virJSONValueNewString(value);
if (!jvalue)
return -1;
if (virJSONValueObjectInsert(object, key, jvalue, prepend) < 0) {
virJSONValueFree(jvalue);
return -1;
}
return 0;
}
int
virJSONValueObjectAppendString(virJSONValuePtr object,
const char *key,
const char *value)
{
virJSONValuePtr jvalue = virJSONValueNewString(value);
if (!jvalue)
return -1;
if (virJSONValueObjectAppend(object, key, jvalue) < 0) {
virJSONValueFree(jvalue);
return -1;
}
return 0;
return virJSONValueObjectInsertString(object, key, value, false);
}
int
virJSONValueObjectPrependString(virJSONValuePtr object,
const char *key,
const char *value)
{
return virJSONValueObjectInsertString(object, key, value, true);
}

1
src/util/virjson.h
View File

@ -126,6 +126,7 @@ int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key, bool *
int virJSONValueObjectIsNull(virJSONValuePtr object, const char *key);
int virJSONValueObjectAppendString(virJSONValuePtr object, const char *key, const char *value);
int virJSONValueObjectPrependString(virJSONValuePtr object, const char *key, const char *value);
int virJSONValueObjectAppendNumberInt(virJSONValuePtr object, const char *key, int number);
int virJSONValueObjectAppendNumberUint(virJSONValuePtr object, const char *key, unsigned int number);
int virJSONValueObjectAppendNumberLong(virJSONValuePtr object, const char *key, long long number);