From nobody Sun Feb 8 14:07:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1571059180; cv=none; d=zoho.com; s=zohoarc; b=gxdV/b/yAts1IxIu22yy98xcGSswBsjeeNM3TbLeQEQ5BuF/aiogL1+RnRcy3baHpMo6AhE0jaF+aE0Jo7kufhTdYB6xPlelvqmSHEGquVQ6MOaRwFx1Atq22Ux62hE0tU50HwCTpUifjbSTqMJjD8j93FgfMVeW9NkHjTh3qTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059180; 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=YmcOqUyndJAtoEvL+Eo3Xnb4/kB+8ypIn39zjHndJVw=; b=dDNbMOKNSc0BJpnNzxamvm3Au2dxZDtIK0+C7t/CuhcX4iq1GwdFc9lBGxQPL1+bYiHCJUmn7d2n4gHrwQ/W+KdD5UW3hw/fhoh0ZaPkGLu2zPkANiVlggt0nbaE27Qq+Wb5aTe41EJhhF49uSMdHeS7Np7LzMo3bnI9PWAqRzE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571059180523480.5715267373114; Mon, 14 Oct 2019 06:19:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED331801674; Mon, 14 Oct 2019 13:19:38 +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 C3EEC6012D; Mon, 14 Oct 2019 13:19:38 +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 79AF06B4B3; Mon, 14 Oct 2019 13:19:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9EDGDUR017337 for ; Mon, 14 Oct 2019 09:16:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D83F600CD; Mon, 14 Oct 2019 13:16:13 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15FAB60126 for ; Mon, 14 Oct 2019 13:16:11 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:22 +0200 Message-Id: <87dcec89660f60465ac20e6816622a35fd83ab34.1571058852.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/35] use G_GNUC_NULL_TERMINATED instead of ATTRIBUTE_SENTINEL 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 14 Oct 2019 13:19:39 +0000 (UTC) Prefer G_GNUC_NULL_TERMINATED which was introduced in GLib 2.8. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/virbuffer.h | 2 +- src/util/vircommand.h | 4 ++-- src/util/virfile.h | 2 +- src/util/virfirewall.h | 4 ++-- src/util/virjson.h | 4 ++-- src/util/virtypedparam.h | 2 +- src/vz/vz_utils.h | 2 +- tests/domaincapstest.c | 2 +- tests/qemumonitortestutils.h | 2 +- tests/testutils.h | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0ef8b563f5..62edb665a7 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1159,7 +1159,7 @@ qemuAgentCommand(qemuAgentPtr mon, return ret; } =20 -static virJSONValuePtr ATTRIBUTE_SENTINEL +static virJSONValuePtr G_GNUC_NULL_TERMINATED qemuAgentMakeCommand(const char *cmdname, ...) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dbc32acb5e..6818e726c6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -557,7 +557,7 @@ qemuMonitorJSONMakeCommandInternal(const char *cmdname, } =20 =20 -static virJSONValuePtr ATTRIBUTE_SENTINEL +static virJSONValuePtr G_GNUC_NULL_TERMINATED qemuMonitorJSONMakeCommand(const char *cmdname, ...) { diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index d5a7a8dc33..75e26c32ff 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -77,7 +77,7 @@ void virBufferAsprintf(virBufferPtr buf, const char *form= at, ...) void virBufferVasprintf(virBufferPtr buf, const char *format, va_list ap) ATTRIBUTE_FMT_PRINTF(2, 0); void virBufferStrcat(virBufferPtr buf, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; void virBufferStrcatVArgs(virBufferPtr buf, va_list ap); =20 void virBufferEscape(virBufferPtr buf, char escape, const char *toescape, diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 1a7158d4c1..632d02bc71 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -42,7 +42,7 @@ virCommandPtr virCommandNew(const char *binary) ATTRIBUTE= _NONNULL(1); virCommandPtr virCommandNewArgs(const char *const*args) ATTRIBUTE_NONNULL(= 1); =20 virCommandPtr virCommandNewArgList(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; =20 virCommandPtr virCommandNewVAList(const char *binary, va_list list) ATTRIBUTE_NONNULL(1); @@ -137,7 +137,7 @@ void virCommandAddArgSet(virCommandPtr cmd, =20 void virCommandAddArgList(virCommandPtr cmd, ... /* const char *arg, ..., NULL */) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 void virCommandSetWorkingDirectory(virCommandPtr cmd, const char *pwd) ATTRIBUTE_NONNULL(2); diff --git a/src/util/virfile.h b/src/util/virfile.h index 2b037b00aa..f22380550c 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -317,7 +317,7 @@ char *virFileFindMountPoint(const char *type); /* NB: this should be combined with virFileBuildPath */ #define virBuildPath(path, ...) \ virBuildPathInternal(path, __VA_ARGS__, NULL) -int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; +int virBuildPathInternal(char **path, ...) G_GNUC_NULL_TERMINATED; =20 int virFilePrintf(FILE *fp, const char *msg, ...) ATTRIBUTE_FMT_PRINTF(2, 3); diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index ff4626975b..a2c0e9c26d 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -65,7 +65,7 @@ virFirewallRulePtr virFirewallAddRuleFull(virFirewallPtr = firewall, virFirewallQueryCallback cb, void *opaque, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 void virFirewallRemoveRule(virFirewallPtr firewall, virFirewallRulePtr rule); @@ -88,7 +88,7 @@ void virFirewallRuleAddArgSet(virFirewallPtr firewall, void virFirewallRuleAddArgList(virFirewallPtr firewall, virFirewallRulePtr rule, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 size_t virFirewallRuleGetArgCount(virFirewallRulePtr rule); =20 diff --git a/src/util/virjson.h b/src/util/virjson.h index a5f959595f..65b8d5620a 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -48,11 +48,11 @@ void virJSONValueHashFree(void *opaque, const void *nam= e); virJSONType virJSONValueGetType(const virJSONValue *value); =20 int virJSONValueObjectCreate(virJSONValuePtr *obj, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectCreateVArgs(virJSONValuePtr *obj, va_list args) ATTRIBUTE_NONNULL(1); int virJSONValueObjectAdd(virJSONValuePtr obj, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectAddVArgs(virJSONValuePtr obj, va_list args) ATTRIBUTE_NONNULL(1); =20 diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 34cff1b2b3..2c998978ea 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -62,7 +62,7 @@ struct _virTypedParameterRemote { =20 int virTypedParamsValidate(virTypedParameterPtr params, int nparams, /* const char *name, int type ... */ ...) - ATTRIBUTE_SENTINEL ATTRIBUTE_RETURN_CHECK; + G_GNUC_NULL_TERMINATED ATTRIBUTE_RETURN_CHECK; =20 bool virTypedParamsCheck(virTypedParameterPtr params, int nparams, diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index f116f9dd1f..7ebb34bb11 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -122,7 +122,7 @@ void vzDomObjFree(void *p); virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); =20 char * vzGetOutput(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; =20 vzDriverPtr vzGetDriverConnection(void); diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index b6961a986b..db14114cba 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -27,7 +27,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE =20 #if WITH_QEMU || WITH_BHYVE -static int ATTRIBUTE_SENTINEL +static int G_GNUC_NULL_TERMINATED fillStringValues(virDomainCapsStringValuesPtr values, ...) { int ret =3D 0; diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 75ea63382d..2333fceed0 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -65,7 +65,7 @@ int qemuMonitorTestAddItemParams(qemuMonitorTestPtr test, const char *cmdname, const char *response, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 int qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test, const char *cmdname, diff --git a/tests/testutils.h b/tests/testutils.h index 85ba9fbc0b..9099a77664 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -48,9 +48,9 @@ int virTestRun(const char *title, const void *data); int virTestLoadFile(const char *file, char **buf); char *virTestLoadFilePath(const char *p, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; virJSONValuePtr virTestLoadFileJSON(const char *p, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 int virTestCaptureProgramOutput(const char *const argv[], char **buf, int = maxlen); =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list