From 12f48c53f5eee69e11438ffcdd28a9316bcee6bc Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 9 Nov 2021 16:32:43 +0100 Subject: [PATCH] util: json: Remove virJSONValueObjectCreate(VArgs) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The functions were obsoleted by virJSONValueObjectAdd(VArgs) Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/libvirt_private.syms | 2 -- src/util/virjson.c | 24 ------------------------ src/util/virjson.h | 4 ---- 3 files changed, 30 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9ee8fda25f..a7bc50a4d1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2561,8 +2561,6 @@ virJSONValueObjectAppendNumberUint; virJSONValueObjectAppendNumberUlong; virJSONValueObjectAppendString; virJSONValueObjectAppendStringPrintf; -virJSONValueObjectCreate; -virJSONValueObjectCreateVArgs; virJSONValueObjectDeflatten; virJSONValueObjectForeachKeyValue; virJSONValueObjectGet; diff --git a/src/util/virjson.c b/src/util/virjson.c index 8b3599e94f..dbc5b7840c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -369,30 +369,6 @@ virJSONValueObjectAdd(virJSONValue **objptr, ...) } -int -virJSONValueObjectCreateVArgs(virJSONValue **obj, - va_list args) -{ - *obj = NULL; - - return virJSONValueObjectAddVArgs(obj, args); -} - - -int -virJSONValueObjectCreate(virJSONValue **obj, ...) -{ - va_list args; - int ret; - - va_start(args, obj); - ret = virJSONValueObjectCreateVArgs(obj, args); - va_end(args); - - return ret; -} - - void virJSONValueFree(virJSONValue *value) { diff --git a/src/util/virjson.h b/src/util/virjson.h index 0d8dad754d..361b0190e8 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -44,10 +44,6 @@ void virJSONValueHashFree(void *opaque); virJSONType virJSONValueGetType(const virJSONValue *value); -int virJSONValueObjectCreate(virJSONValue **obj, ...) - ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; -int virJSONValueObjectCreateVArgs(virJSONValue **obj, va_list args) - ATTRIBUTE_NONNULL(1); int virJSONValueObjectAdd(virJSONValue **obj, ...) ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args)