From nobody Wed Jan 15 13:09:42 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705422173864786.4005486687315; Tue, 16 Jan 2024 08:22:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id BD1E51E87; Tue, 16 Jan 2024 11:22:52 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4ECE51E2F; Tue, 16 Jan 2024 11:13:27 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 649891CED; Tue, 16 Jan 2024 11:12:58 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E546A1CE5 for ; Tue, 16 Jan 2024 11:12:54 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-iWsB54cpNGyoEw8mJ600PA-1; Tue, 16 Jan 2024 11:12:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88128811E9C for ; Tue, 16 Jan 2024 16:12:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id F384D1C060AF for ; Tue, 16 Jan 2024 16:12:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: iWsB54cpNGyoEw8mJ600PA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 05/10] util: json: Remove 'virJSONValueObjectReplaceValue' Date: Tue, 16 Jan 2024 17:12:39 +0100 Message-ID: <27dde69a307ed8527412f8184e5608faba6fd975.1705421341.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: DQQMK3DSDEREG3MWWK74E5KYSZRRLQEV X-Message-ID-Hash: DQQMK3DSDEREG3MWWK74E5KYSZRRLQEV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705422175172100001 The helper was used only in 'qemucapabilitiesnumbering' test which was removed. Signed-off-by: Peter Krempa Reviewed-by: Andrea Bolognani --- src/libvirt_private.syms | 1 - src/util/virjson.c | 20 -------------------- src/util/virjson.h | 6 ------ 3 files changed, 27 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fc26109029..eba5a45343 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2665,7 +2665,6 @@ virJSONValueObjectHasKey; virJSONValueObjectKeysNumber; virJSONValueObjectPrependString; virJSONValueObjectRemoveKey; -virJSONValueObjectReplaceValue; virJSONValueObjectStealArray; virJSONValueObjectStealObject; virJSONValueToBuffer; diff --git a/src/util/virjson.c b/src/util/virjson.c index 03c3b6cfb9..57707350da 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1136,26 +1136,6 @@ virJSONValueObjectGetString(virJSONValue *object, } -void -virJSONValueObjectReplaceValue(virJSONValue *object, - const char *key, - virJSONValue **newval) -{ - size_t i; - - if (object->type !=3D VIR_JSON_TYPE_OBJECT || - !*newval) - return; - - for (i =3D 0; i < object->data.object.npairs; i++) { - if (STREQ(object->data.object.pairs[i].key, key)) { - virJSONValueFree(object->data.object.pairs[i].value); - object->data.object.pairs[i].value =3D g_steal_pointer(newval); - } - } -} - - /** * virJSONValueObjectGetStringOrNumber: * @object: JSON value object diff --git a/src/util/virjson.h b/src/util/virjson.h index 95b8b14ae6..e622798fe7 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -241,12 +241,6 @@ virJSONValueObjectRemoveKey(virJSONValue *object, virJSONValue **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -void -virJSONValueObjectReplaceValue(virJSONValue *object, - const char *key, - virJSONValue **newval) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - int virJSONValueArrayAppendString(virJSONValue *object, const char *value); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org