From nobody Mon Feb 9 17:58:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1594006943; cv=none; d=zohomail.com; s=zohoarc; b=AFbJuQeHC/G3av9vhWw4sv/d7ocKecKEpiZN5gDtNY5bS24ENMfJITtdosaHO8pCHoXeI6Q2td4Tv9WcVSVEtT5yhtVy9/oHH6NJCpmemYkys4WU7pOyGVT8XJl10J7QgYhrcETD+h/4OaM9eACkG4YLzgAG240vWVi/qY1xw34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594006943; 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=HF7hzNhB0mnRb2SnEgtCksc90l+FY2gD6sKrl3JmcI8=; b=mZNV/r5TB5i7pfyv4NjDTrguEBFeXc5RvWV4rcfaZH4O4xOyeds8ufqllPFcSGqrHNs+YOfWyZCILgHxa2jzHX1MqvX8DP14QAjdjQIIpebaLaL7/moeWdzv1eBX1uuUrw/Vlj0y1Y89LHlFEOcE26zNkkYXrPsu1qwiY0wR+sY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594006943176274.46635104923234; Sun, 5 Jul 2020 20:42:23 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-160-SjOwkI-KMrK0Gja2t_9cyA-1; Sun, 05 Jul 2020 23:42:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2BE68015F5; Mon, 6 Jul 2020 03:42:12 +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 8FC1360CC0; Mon, 6 Jul 2020 03:42:12 +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 6094E93F77; Mon, 6 Jul 2020 03:42:12 +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 0663fhhj004453 for ; Sun, 5 Jul 2020 23:41:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id DAD327AC9F; Mon, 6 Jul 2020 03:41:43 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-194.phx2.redhat.com [10.3.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 763E471678 for ; Mon, 6 Jul 2020 03:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594006941; 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=HF7hzNhB0mnRb2SnEgtCksc90l+FY2gD6sKrl3JmcI8=; b=c/WkIrh+JQTkrjBwnaXJ/iII/HStNspWhFRy5JqqdDgBeuT2rHdXk6id3ksgfsYdiElTgu WOyakZqZsg1Cw5cQX8NKh4pUvDThRueus/THnQ/cjY1CDRVK9vVZjCUkEyNlDFaT3Krjzd dYc60HAxMMUccbZ81EjHA4xiShIGimI= X-MC-Unique: SjOwkI-KMrK0Gja2t_9cyA-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 07/32] tests: use g_auto for all virBuffers Date: Sun, 5 Jul 2020 23:41:02 -0400 Message-Id: <20200706034127.1117504-8-laine@redhat.com> In-Reply-To: <20200706034127.1117504-1-laine@redhat.com> References: <20200706034127.1117504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.12 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- tests/commandtest.c | 3 +-- tests/cputest.c | 2 +- tests/networkxml2firewalltest.c | 3 +-- tests/nodedevmdevctltest.c | 6 ++---- tests/nwfilterebiptablestest.c | 21 +++++++-------------- tests/nwfilterxml2firewalltest.c | 3 +-- tests/qemublocktest.c | 2 +- tests/qemucommandutiltest.c | 2 +- tests/qemumigparamstest.c | 6 ++---- tests/qemumonitorjsontest.c | 9 ++++----- tests/qemumonitortestutils.c | 2 +- tests/testutils.c | 2 +- tests/vboxsnapshotxmltest.c | 3 +-- tests/virbuftest.c | 23 ++++++++++------------- tests/vircgrouptest.c | 3 +-- tests/virfirewalltest.c | 30 ++++++++++-------------------- tests/virhostcputest.c | 3 +-- tests/virkmodtest.c | 4 ++-- tests/virnetdevbandwidthtest.c | 3 +-- 19 files changed, 49 insertions(+), 81 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index d5092b7dd0..f0e60ee5fe 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -390,7 +390,7 @@ static int test9(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); const char* const args[] =3D { "arg1", "arg2", NULL }; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virCommandAddArg(cmd, "-version"); virCommandAddArgPair(cmd, "-log", "bar.log"); @@ -402,7 +402,6 @@ static int test9(const void *unused G_GNUC_UNUSED) =20 if (virBufferUse(&buf)) { printf("Buffer not transferred\n"); - virBufferFreeAndReset(&buf); virCommandFree(cmd); return -1; } diff --git a/tests/cputest.c b/tests/cputest.c index 0cf6870574..83d63bf495 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -237,7 +237,7 @@ cpuTestGuestCPU(const void *arg) virCPUDefPtr host =3D NULL; virCPUDefPtr cpu =3D NULL; virCPUCompareResult cmpResult; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *result =3D NULL; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 69fadd55c4..29e7d8bc38 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -62,7 +62,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *baseargs) { char *actualargv =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virNetworkDefPtr def =3D NULL; int ret =3D -1; char *actual; @@ -92,7 +92,6 @@ static int testCompareXMLToArgvFiles(const char *xml, ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); VIR_FREE(actualargv); virNetworkDefFree(def); return ret; diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index f5bcf5227d..9780553a3a 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -54,7 +54,7 @@ testMdevctlStart(const char *virt_type, { g_autoptr(virNodeDeviceDef) def =3D NULL; virNodeDeviceObjPtr obj =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *actualCmdline =3D NULL; int ret =3D -1; g_autofree char *uuid =3D NULL; @@ -87,7 +87,6 @@ testMdevctlStart(const char *virt_type, ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); virCommandSetDryRun(NULL, NULL, NULL); virNodeDeviceObjEndAPI(&obj); return ret; @@ -114,7 +113,7 @@ static int testMdevctlStop(const void *data) { const char *uuid =3D data; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *actualCmdline =3D NULL; int ret =3D -1; g_autoptr(virCommand) cmd =3D NULL; @@ -140,7 +139,6 @@ testMdevctlStop(const void *data) ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); virCommandSetDryRun(NULL, NULL, NULL); return ret; } diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 3e6c335d4e..4d8791023c 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -68,7 +68,7 @@ static int testNWFilterEBIPTablesAllTeardown(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D VIR_NWFILTER_NEW_RULES_TEARDOWN "iptables -D libvirt-out -m physdev --physdev-is-bridged --physdev= -out vnet0 -g FO-vnet0\n" @@ -120,7 +120,6 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque G_= GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } @@ -129,7 +128,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque G_= GNUC_UNUSED) static int testNWFilterEBIPTablesTearOldRules(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D "iptables -D libvirt-out -m physdev --physdev-is-bridged --physdev= -out vnet0 -g FO-vnet0\n" "iptables -D libvirt-out -m physdev --physdev-out vnet0 -g FO-vnet= 0\n" @@ -188,7 +187,6 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque G= _GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } @@ -197,7 +195,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque G= _GNUC_UNUSED) static int testNWFilterEBIPTablesRemoveBasicRules(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D "ebtables -t nat -D PREROUTING -i vnet0 -j libvirt-I-vnet0\n" "ebtables -t nat -D POSTROUTING -o vnet0 -j libvirt-O-vnet0\n" @@ -234,7 +232,6 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaq= ue G_GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } @@ -243,7 +240,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaq= ue G_GNUC_UNUSED) static int testNWFilterEBIPTablesTearNewRules(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D VIR_NWFILTER_NEW_RULES_TEARDOWN; char *actual =3D NULL; @@ -265,7 +262,6 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque G= _GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } @@ -274,7 +270,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque G= _GNUC_UNUSED) static int testNWFilterEBIPTablesApplyBasicRules(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D VIR_NWFILTER_NEW_RULES_TEARDOWN "iptables -D libvirt-out -m physdev --physdev-is-bridged --physdev= -out vnet0 -g FO-vnet0\n" @@ -334,7 +330,6 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaqu= e G_GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } @@ -343,7 +338,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaqu= e G_GNUC_UNUSED) static int testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D VIR_NWFILTER_NEW_RULES_TEARDOWN "iptables -D libvirt-out -m physdev --physdev-is-bridged --physdev= -out vnet0 -g FO-vnet0\n" @@ -421,7 +416,6 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *op= aque G_GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } @@ -431,7 +425,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *op= aque G_GNUC_UNUSED) static int testNWFilterEBIPTablesApplyDropAllRules(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D VIR_NWFILTER_NEW_RULES_TEARDOWN "iptables -D libvirt-out -m physdev --physdev-is-bridged --physdev= -out vnet0 -g FO-vnet0\n" @@ -491,7 +485,6 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *opa= que G_GNUC_UNUSED) ret =3D 0; cleanup: virCommandSetDryRun(NULL, NULL, NULL); - virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index da86ec9463..dff2b62028 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -368,7 +368,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline) { char *actualargv =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virHashTablePtr vars =3D virNWFilterHashTableCreate(0); virNWFilterInst inst; int ret =3D -1; @@ -403,7 +403,6 @@ static int testCompareXMLToArgvFiles(const char *xml, ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); VIR_FREE(actualargv); virNWFilterInstReset(&inst); virHashFree(vars); diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0ab599dd67..51283793e9 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -383,7 +383,7 @@ static int testQemuDiskXMLToPropsValidateFile(const void *opaque) { struct testQemuDiskXMLToJSONData *data =3D (void *) opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *jsonpath =3D NULL; g_autofree char *actual =3D NULL; size_t i; diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index 049fd2f0b0..305f59e76b 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -38,7 +38,7 @@ testQemuCommandBuildFromJSON(const void *opaque) { const testQemuCommandBuildObjectFromJSONData *data =3D opaque; virJSONValuePtr val =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *result =3D NULL; int ret =3D -1; =20 diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index 954cd1c578..057cde5e72 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -58,7 +58,7 @@ static int qemuMigParamsTestXML2XML(const void *opaque) { const qemuMigParamsData *data =3D opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *xmlFile =3D NULL; xmlDocPtr doc =3D NULL; xmlXPathContextPtr ctxt =3D NULL; @@ -89,7 +89,6 @@ qemuMigParamsTestXML2XML(const void *opaque) VIR_FREE(xmlFile); VIR_FREE(actualXML); qemuMigrationParamsFree(migParams); - virBufferFreeAndReset(&buf); xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); return ret; @@ -100,7 +99,7 @@ static int qemuMigParamsTestXML(const void *opaque) { const qemuMigParamsData *data =3D opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *replyFile =3D NULL; char *xmlFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; @@ -140,7 +139,6 @@ qemuMigParamsTestXML(const void *opaque) VIR_FREE(actualXML); virJSONValueFree(params); qemuMigrationParamsFree(migParams); - virBufferFreeAndReset(&buf); qemuMonitorTestFree(mon); return ret; } diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index d2cd054dbf..741e36a491 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2603,7 +2603,7 @@ static char * testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfoPtr vcpus, size_t nvcpus) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; qemuMonitorCPUInfoPtr vcpu; size_t i; =20 @@ -2781,7 +2781,7 @@ testBlockNodeNameDetect(const void *opaque) virJSONValuePtr namedNodesJson =3D NULL; virJSONValuePtr blockstatsJson =3D NULL; virHashTablePtr nodedata =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 resultFile =3D g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefi= x, @@ -2855,7 +2855,7 @@ static int testQAPISchemaValidate(const void *opaque) { const struct testQAPISchemaData *data =3D opaque; - virBuffer debug =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; virJSONValuePtr schemaroot; virJSONValuePtr json =3D NULL; int ret =3D -1; @@ -2883,7 +2883,6 @@ testQAPISchemaValidate(const void *opaque) =20 =20 cleanup: - virBufferFreeAndReset(&debug); virJSONValueFree(json); return ret; } @@ -2918,7 +2917,7 @@ testQueryJobs(const void *opaque) g_autofree char *filenameResult =3D NULL; g_autofree char *actual =3D NULL; qemuMonitorJobInfoPtr *jobs =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t njobs =3D 0; size_t i; int ret =3D -1; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 6be7555dc0..180ac15a15 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -133,7 +133,7 @@ static int qemuMonitorTestAddErrorResponseInternal(qemuMonitorTestPtr test, const char *usermsg) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *escapemsg =3D NULL; g_autofree char *jsonmsg =3D NULL; char *tmp; diff --git a/tests/testutils.c b/tests/testutils.c index 7f1776b244..a1cd093e4e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -251,7 +251,7 @@ static char * virTestLoadFileGetPath(const char *p, va_list ap) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *path =3D NULL; =20 virBufferAddLit(&buf, abs_srcdir "/"); diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 2ea460d8bd..054e2a8e0d 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -18,7 +18,7 @@ GRegex *testSnapshotXMLVariableLineRegex =3D NULL; static char * testFilterXML(char *xml) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char **xmlLines =3D NULL; char **xmlLine; char *ret =3D NULL; @@ -39,7 +39,6 @@ testFilterXML(char *xml) ret =3D virBufferContentAndReset(&buf); =20 cleanup: - virBufferFreeAndReset(&buf); virStringListFree(xmlLines); return ret; } diff --git a/tests/virbuftest.c b/tests/virbuftest.c index f9d19ff1a1..39ae7c2b9d 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -17,7 +17,7 @@ struct testBufAddStrData { =20 static int testBufAutoIndent(const void *data G_GNUC_UNUSED) { - virBuffer bufinit =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) bufinit =3D VIR_BUFFER_INITIALIZER; virBufferPtr buf =3D &bufinit; const char expected[] =3D " 1\n 2\n 3\n 4\n 5\n 6\n 7\n &\n 8\n 9\n 10\n ' 1= 1'\n"; @@ -96,7 +96,7 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUS= ED) =20 static int testBufTrim(const void *data G_GNUC_UNUSED) { - virBuffer bufinit =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) bufinit =3D VIR_BUFFER_INITIALIZER; virBufferPtr buf =3D NULL; g_autofree char *result =3D NULL; const char *expected =3D "a,b"; @@ -126,7 +126,6 @@ static int testBufTrim(const void *data G_GNUC_UNUSED) ret =3D 0; =20 cleanup: - virBufferFreeAndReset(buf); return ret; } =20 @@ -134,7 +133,7 @@ static int testBufTrimChars(const void *opaque) { const struct testBufAddStrData *data =3D opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *actual =3D NULL; =20 virBufferAddStr(&buf, data->data); @@ -156,9 +155,9 @@ testBufTrimChars(const void *opaque) =20 static int testBufAddBuffer(const void *data G_GNUC_UNUSED) { - virBuffer buf1 =3D VIR_BUFFER_INITIALIZER; - virBuffer buf2 =3D VIR_BUFFER_INITIALIZER; - virBuffer buf3 =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf1 =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf2 =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf3 =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; g_autofree char *result =3D NULL; const char *expected =3D \ @@ -259,8 +258,6 @@ static int testBufAddBuffer(const void *data G_GNUC_UNU= SED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&buf1); - virBufferFreeAndReset(&buf2); return ret; } =20 @@ -268,7 +265,7 @@ static int testBufAddStr(const void *opaque) { const struct testBufAddStrData *data =3D opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *actual =3D NULL; =20 virBufferAddLit(&buf, "\n"); @@ -296,7 +293,7 @@ static int testBufEscapeStr(const void *opaque) { const struct testBufAddStrData *data =3D opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *actual =3D NULL; =20 virBufferAddLit(&buf, "\n"); @@ -324,7 +321,7 @@ static int testBufEscapeRegex(const void *opaque) { const struct testBufAddStrData *data =3D opaque; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *actual =3D NULL; =20 virBufferEscapeRegex(&buf, "%s", data->data); @@ -347,7 +344,7 @@ testBufEscapeRegex(const void *opaque) static int testBufSetIndent(const void *opaque G_GNUC_UNUSED) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *actual =3D NULL; =20 virBufferSetIndent(&buf, 11); diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 2d6f52fb6e..44e72cbfa9 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -184,7 +184,7 @@ testCgroupDetectMounts(const void *args) char *parsed =3D NULL; const char *actual; virCgroupPtr group =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 g_setenv("VIR_CGROUP_MOCK_FILENAME", data->file, TRUE); @@ -218,7 +218,6 @@ testCgroupDetectMounts(const void *args) g_unsetenv("VIR_CGROUP_MOCK_FILENAME"); VIR_FREE(parsed); virCgroupFree(&group); - virBufferFreeAndReset(&buf); return result; } =20 diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index c4827918c3..4105c1867e 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -199,7 +199,7 @@ struct testFirewallData { static int testFirewallSingleGroup(const void *opaque) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -244,7 +244,6 @@ testFirewallSingleGroup(const void *opaque) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -255,7 +254,7 @@ testFirewallSingleGroup(const void *opaque) static int testFirewallRemoveRule(const void *opaque) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -307,7 +306,6 @@ testFirewallRemoveRule(const void *opaque) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -318,7 +316,7 @@ testFirewallRemoveRule(const void *opaque) static int testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -377,7 +375,6 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -409,7 +406,7 @@ testFirewallRollbackHook(const char *const*args, static int testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -470,7 +467,6 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_U= NUSED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -481,7 +477,7 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_U= NUSED) static int testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -541,7 +537,6 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UN= USED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -552,7 +547,7 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UN= USED) static int testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -606,7 +601,6 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -616,7 +610,7 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) static int testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -690,7 +684,6 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UN= USED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -700,7 +693,7 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UN= USED) static int testFirewallManyRollback(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -777,7 +770,6 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUS= ED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -787,7 +779,7 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUS= ED) static int testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -894,7 +886,6 @@ testFirewallChainedRollback(const void *opaque G_GNUC_U= NUSED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); @@ -981,7 +972,7 @@ testFirewallQueryCallback(virFirewallPtr fw, static int testFirewallQuery(const void *opaque G_GNUC_UNUSED) { - virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; int ret =3D -1; const char *actual =3D NULL; @@ -1073,7 +1064,6 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 62bacddefb..7b83c7ae5d 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -112,7 +112,7 @@ linuxCPUStatsCompareFiles(const char *cpustatfile, char *actualData =3D NULL; FILE *cpustat =3D NULL; virNodeCPUStatsPtr params =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; int nparams =3D 0; =20 @@ -153,7 +153,6 @@ linuxCPUStatsCompareFiles(const char *cpustatfile, ret =3D 0; =20 fail: - virBufferFreeAndReset(&buf); VIR_FORCE_FCLOSE(cpustat); VIR_FREE(actualData); VIR_FREE(params); diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index 3ba8c542d1..369eb8baca 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -60,7 +60,7 @@ testKModLoad(const void *args G_GNUC_UNUSED) { int ret =3D -1; char *errbuf =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virCommandSetDryRun(&buf, NULL, NULL); =20 @@ -87,7 +87,7 @@ testKModUnload(const void *args G_GNUC_UNUSED) { int ret =3D -1; char *errbuf =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virCommandSetDryRun(&buf, NULL, NULL); =20 diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 8039fedbc4..5cbdd6ffea 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -70,7 +70,7 @@ testVirNetDevBandwidthSet(const void *data) const struct testSetStruct *info =3D data; const char *iface =3D info->iface; virNetDevBandwidthPtr band =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *actual_cmd =3D NULL; =20 PARSE(info->band, band); @@ -99,7 +99,6 @@ testVirNetDevBandwidthSet(const void *data) cleanup: virCommandSetDryRun(NULL, NULL, NULL); virNetDevBandwidthFree(band); - virBufferFreeAndReset(&buf); VIR_FREE(actual_cmd); return ret; } --=20 2.25.4