From nobody Mon Feb 9 16:02:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640175800; cv=none; d=zohomail.com; s=zohoarc; b=iwM1QgNW8T3d1MxzO/Ahf3J8uJSRKXDOWhO81SD2kRfC3zUKcojLBTCyFyrUn79sN8pc61r7wVsswLsudeo3dWAwrfELWFiibO50KIo98a3vHJ10TELrnV6y7JhCetOjA9ZOU8lrOm+EtEF7k9S5wyLk2Xv5gHJxxxxC74GKL4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640175800; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UrjyJKJyBjMVgSDKDHscrEWvlq2DaqXNNPTgAmdFJFE=; b=hpjSvAc2sztIWvB05qd1wEF7LriSv8aZI8vqFVz23kQIEawNp9RrwMUl0NOVESZpCM4Hnq3fN3lLelImkw4DACaVIXKsaA6KyfUTxOdGVcULxukSdUutL09+QProUaBkojjfQljjIAiNcoRVTusdGQhIfN8IuctHWCHew3RCAbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16401758006702.661472305426173; Wed, 22 Dec 2021 04:23:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-546-R8DEBUgMMx6-syoc18hhYA-1; Wed, 22 Dec 2021 07:22:01 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54F3F101F008; Wed, 22 Dec 2021 12:21:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F76D79594; Wed, 22 Dec 2021 12:21:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BC0674A70B; Wed, 22 Dec 2021 12:21:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BMC3XIA008500 for ; Wed, 22 Dec 2021 07:03:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 815D8709AA; Wed, 22 Dec 2021 12:03:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA7437314D for ; Wed, 22 Dec 2021 12:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640175799; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UrjyJKJyBjMVgSDKDHscrEWvlq2DaqXNNPTgAmdFJFE=; b=QCVvgg2RtVhFajVcPGe3b/kg1cGL1SOPamKLkD/JXcf0fYSHya32Sy69jgX8dGzDpp375H 4s79sXLGA7MCcMmtnPNOxBziIDVmqNcyfwsiXVTj4JI9O0m0wlsXRdVeGpCmE/C1983F9F IRwT8144cfjNkDs+joRoTvS49hX6x5Q= X-MC-Unique: R8DEBUgMMx6-syoc18hhYA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/6] util: virjson.h: Reformat headers to conform with new style Date: Wed, 22 Dec 2021 13:02:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640175802543100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/util/virjson.h | 312 +++++++++++++++++++++++++++++++-------------- 1 file changed, 218 insertions(+), 94 deletions(-) diff --git a/src/util/virjson.h b/src/util/virjson.h index 24ac51f4f8..f0b8c419de 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -39,123 +39,247 @@ typedef enum { typedef struct _virJSONValue virJSONValue; -void virJSONValueFree(virJSONValue *value); -void virJSONValueHashFree(void *opaque); +void +virJSONValueFree(virJSONValue *value); +void +virJSONValueHashFree(void *opaque); -virJSONType virJSONValueGetType(const virJSONValue *value); +virJSONType +virJSONValueGetType(const virJSONValue *value); -int virJSONValueObjectAdd(virJSONValue **obj, ...) +int +virJSONValueObjectAdd(virJSONValue **obj, ...) ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; -int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args) +int +virJSONValueObjectAddVArgs(virJSONValue **objptr, + va_list args) ATTRIBUTE_NONNULL(1); -virJSONValue *virJSONValueNewString(char *data); -virJSONValue *virJSONValueNewNumberInt(int data); -virJSONValue *virJSONValueNewNumberUint(unsigned int data); -virJSONValue *virJSONValueNewNumberLong(long long data); -virJSONValue *virJSONValueNewNumberUlong(unsigned long long data); -virJSONValue *virJSONValueNewNumberDouble(double data); -virJSONValue *virJSONValueNewBoolean(int boolean); -virJSONValue *virJSONValueNewNull(void); -virJSONValue *virJSONValueNewArray(void); -virJSONValue *virJSONValueNewObject(void); +virJSONValue * +virJSONValueNewString(char *data); +virJSONValue * +virJSONValueNewNumberInt(int data); +virJSONValue * +virJSONValueNewNumberUint(unsigned int data); +virJSONValue * +virJSONValueNewNumberLong(long long data); +virJSONValue * +virJSONValueNewNumberUlong(unsigned long long data); +virJSONValue * +virJSONValueNewNumberDouble(double data); +virJSONValue * +virJSONValueNewBoolean(int boolean); +virJSONValue * +virJSONValueNewNull(void); +virJSONValue * +virJSONValueNewArray(void); +virJSONValue * +virJSONValueNewObject(void); + +int +virJSONValueObjectAppend(virJSONValue *object, + const char *key, + virJSONValue **value); +int +virJSONValueArrayAppend(virJSONValue *object, + virJSONValue **value); +int +virJSONValueArrayConcat(virJSONValue *a, + virJSONValue *c); + +int +virJSONValueObjectHasKey(virJSONValue *object, + const char *key); +virJSONValue * +virJSONValueObjectGet(virJSONValue *object, + const char *key); +virJSONValue * +virJSONValueObjectGetByType(virJSONValue *object, + const char *key, + virJSONType type); + +bool +virJSONValueIsObject(virJSONValue *object); + +bool +virJSONValueIsArray(virJSONValue *array); +size_t +virJSONValueArraySize(const virJSONValue *array); +virJSONValue * +virJSONValueArrayGet(virJSONValue *object, + unsigned int element); +virJSONValue * +virJSONValueArraySteal(virJSONValue *object, + unsigned int element); -int virJSONValueObjectAppend(virJSONValue *object, - const char *key, - virJSONValue **value); -int virJSONValueArrayAppend(virJSONValue *object, - virJSONValue **value); -int virJSONValueArrayConcat(virJSONValue *a, - virJSONValue *c); - -int virJSONValueObjectHasKey(virJSONValue *object, const char *key); -virJSONValue *virJSONValueObjectGet(virJSONValue *object, const char *key); -virJSONValue *virJSONValueObjectGetByType(virJSONValue *object, - const char *key, virJSONType t= ype); - -bool virJSONValueIsObject(virJSONValue *object); - -bool virJSONValueIsArray(virJSONValue *array); -size_t virJSONValueArraySize(const virJSONValue *array); -virJSONValue *virJSONValueArrayGet(virJSONValue *object, unsigned int elem= ent); -virJSONValue *virJSONValueArraySteal(virJSONValue *object, unsigned int el= ement); typedef int (*virJSONArrayIteratorFunc)(size_t pos, virJSONValue *item, void *opaque); -int virJSONValueArrayForeachSteal(virJSONValue *array, - virJSONArrayIteratorFunc cb, - void *opaque); -int virJSONValueObjectKeysNumber(virJSONValue *object); -const char *virJSONValueObjectGetKey(virJSONValue *object, unsigned int n); -virJSONValue *virJSONValueObjectGetValue(virJSONValue *object, unsigned in= t n); - -const char *virJSONValueGetString(virJSONValue *object); -const char *virJSONValueGetNumberString(virJSONValue *number); -int virJSONValueGetNumberInt(virJSONValue *object, int *value); -int virJSONValueGetNumberUint(virJSONValue *object, unsigned int *value); -int virJSONValueGetNumberLong(virJSONValue *object, long long *value); -int virJSONValueGetNumberUlong(virJSONValue *object, unsigned long long *v= alue); -int virJSONValueGetNumberDouble(virJSONValue *object, double *value); -int virJSONValueGetBoolean(virJSONValue *object, bool *value); -virJSONValue *virJSONValueObjectGetObject(virJSONValue *object, - const char *key); -virJSONValue *virJSONValueObjectGetArray(virJSONValue *object, - const char *key); -virJSONValue *virJSONValueObjectStealArray(virJSONValue *object, - const char *key); -virJSONValue *virJSONValueObjectStealObject(virJSONValue *object, - const char *key); - -const char *virJSONValueObjectGetString(virJSONValue *object, const char *= key); -char **virJSONValueObjectGetStringArray(virJSONValue *object, const char *= key); -const char *virJSONValueObjectGetStringOrNumber(virJSONValue *object, cons= t char *key); -int virJSONValueObjectGetNumberInt(virJSONValue *object, const char *key, = int *value); -int virJSONValueObjectGetNumberUint(virJSONValue *object, const char *key,= unsigned int *value); -int virJSONValueObjectGetNumberLong(virJSONValue *object, const char *key,= long long *value); -int virJSONValueObjectGetNumberUlong(virJSONValue *object, const char *key= , unsigned long long *value); -int virJSONValueObjectGetNumberDouble(virJSONValue *object, const char *ke= y, double *value); -int virJSONValueObjectGetBoolean(virJSONValue *object, const char *key, bo= ol *value); - -int virJSONValueObjectAppendString(virJSONValue *object, const char *key, = const char *value); -int virJSONValueObjectAppendStringPrintf(virJSONValue *object, const char = *key, const char *fmt, ...) +int +virJSONValueArrayForeachSteal(virJSONValue *array, + virJSONArrayIteratorFunc cb, + void *opaque); + +int +virJSONValueObjectKeysNumber(virJSONValue *object); +const char * +virJSONValueObjectGetKey(virJSONValue *object, + unsigned int n); +virJSONValue * +virJSONValueObjectGetValue(virJSONValue *object, + unsigned int n); + +const char * +virJSONValueGetString(virJSONValue *object); +const char * +virJSONValueGetNumberString(virJSONValue *number); +int +virJSONValueGetNumberInt(virJSONValue *object, + int *value); +int +virJSONValueGetNumberUint(virJSONValue *object, + unsigned int *value); +int +virJSONValueGetNumberLong(virJSONValue *object, + long long *value); +int +virJSONValueGetNumberUlong(virJSONValue *object, + unsigned long long *value); +int +virJSONValueGetNumberDouble(virJSONValue *object, + double *value); +int +virJSONValueGetBoolean(virJSONValue *object, + bool *value); + +virJSONValue * +virJSONValueObjectGetObject(virJSONValue *object, + const char *key); +virJSONValue * +virJSONValueObjectGetArray(virJSONValue *object, + const char *key); +virJSONValue * +virJSONValueObjectStealArray(virJSONValue *object, + const char *key); +virJSONValue * +virJSONValueObjectStealObject(virJSONValue *object, + const char *key); +const char * +virJSONValueObjectGetString(virJSONValue *object, + const char *key); +char ** +virJSONValueObjectGetStringArray(virJSONValue *object, + const char *key); +const char * +virJSONValueObjectGetStringOrNumber(virJSONValue *object, + const char *key); +int +virJSONValueObjectGetNumberInt(virJSONValue *object, + const char *key, + int *value); +int +virJSONValueObjectGetNumberUint(virJSONValue *object, + const char *key, + unsigned int *value); +int +virJSONValueObjectGetNumberLong(virJSONValue *object, + const char *key, + long long *value); +int +virJSONValueObjectGetNumberUlong(virJSONValue *object, + const char *key, + unsigned long long *value); +int +virJSONValueObjectGetNumberDouble(virJSONValue *object, + const char *key, + double *value); +int +virJSONValueObjectGetBoolean(virJSONValue *object, + const char *key, + bool *value); + +int +virJSONValueObjectAppendString(virJSONValue *object, + const char *key, + const char *value); +int +virJSONValueObjectAppendStringPrintf(virJSONValue *object, + const char *key, + const char *fmt, + ...) G_GNUC_PRINTF(3, 4); -int virJSONValueObjectPrependString(virJSONValue *object, const char *key,= const char *value); -int virJSONValueObjectAppendNumberInt(virJSONValue *object, const char *ke= y, int number); -int virJSONValueObjectAppendNumberUint(virJSONValue *object, const char *k= ey, unsigned int number); -int virJSONValueObjectAppendNumberLong(virJSONValue *object, const char *k= ey, long long number); -int virJSONValueObjectAppendNumberUlong(virJSONValue *object, const char *= key, unsigned long long number); -int virJSONValueObjectAppendNumberDouble(virJSONValue *object, const char = *key, double number); -int virJSONValueObjectAppendBoolean(virJSONValue *object, const char *key,= int boolean); -int virJSONValueObjectAppendNull(virJSONValue *object, const char *key); - -int virJSONValueObjectRemoveKey(virJSONValue *object, const char *key, - virJSONValue **value) +int +virJSONValueObjectPrependString(virJSONValue *object, + const char *key, + const char *value); +int +virJSONValueObjectAppendNumberInt(virJSONValue *object, + const char *key, + int number); +int +virJSONValueObjectAppendNumberUint(virJSONValue *object, + const char *key, + unsigned int number); +int +virJSONValueObjectAppendNumberLong(virJSONValue *object, + const char *key, + long long number); +int +virJSONValueObjectAppendNumberUlong(virJSONValue *object, + const char *key, + unsigned long long number); +int +virJSONValueObjectAppendNumberDouble(virJSONValue *object, + const char *key, + double number); +int +virJSONValueObjectAppendBoolean(virJSONValue *object, + const char *key, + int boolean); +int +virJSONValueObjectAppendNull(virJSONValue *object, + const char *key); + +int +virJSONValueObjectRemoveKey(virJSONValue *object, + const char *key, + virJSONValue **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int virJSONValueArrayAppendString(virJSONValue *object, const char *value); +int +virJSONValueArrayAppendString(virJSONValue *object, + const char *value); -virJSONValue *virJSONValueFromString(const char *jsonstring); -char *virJSONValueToString(virJSONValue *object, - bool pretty); -int virJSONValueToBuffer(virJSONValue *object, - virBuffer *buf, - bool pretty) +virJSONValue * +virJSONValueFromString(const char *jsonstring); +char * +virJSONValueToString(virJSONValue *object, + bool pretty); +int +virJSONValueToBuffer(virJSONValue *object, + virBuffer *buf, + bool pretty) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; typedef int (*virJSONValueObjectIteratorFunc)(const char *key, virJSONValue *value, void *opaque); -int virJSONValueObjectForeachKeyValue(virJSONValue *object, - virJSONValueObjectIteratorFunc cb, - void *opaque); +int +virJSONValueObjectForeachKeyValue(virJSONValue *object, + virJSONValueObjectIteratorFunc cb, + void *opaque); -virJSONValue *virJSONValueCopy(const virJSONValue *in); +virJSONValue * +virJSONValueCopy(const virJSONValue *in); -char *virJSONStringReformat(const char *jsonstr, bool pretty); +char * +virJSONStringReformat(const char *jsonstr, + bool pretty); -virJSONValue *virJSONValueObjectDeflatten(virJSONValue *json); +virJSONValue * +virJSONValueObjectDeflatten(virJSONValue *json); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virJSONValue, virJSONValueFree); --=20 2.31.1