From nobody Mon Feb 9 01:34:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1591868693; cv=none; d=zohomail.com; s=zohoarc; b=Kj1ClB5jbZc8DXmLNKjlRkdeVG23Dbl5APecmtedJHL5jk014iNHf3zPeOtn0w4NPRrRgx7vDN69phJ6YdGUEdYD0EoXbNlRu4mZXKvm+eEwmt58hLHWzd9hv1F2nElWoA//U0QnNPe0OJ34oQpeQbUqLr1dMEwjuqoqWXBujo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591868693; 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=FicEUfTcvVMw19UlPgXQUi6Be2cebdZWkypExT1rwsY=; b=ghpxVXfqkkaUqUpcBFiKmp4PtEOyUq+Jx2D4OR4QgAqSOC2Q3PAEsbhcdjqis89A9HqkS2Wz/rqbaanqtIlKr/OOWUb4IpQiAWo+1NrQ11kdSirUoj8Aq9z6areFqRZeuKWC/UB/8ikOT4YpTvv+iwOI+lhBONc3qfNmAWFzslw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1591868693949910.9347792718834; Thu, 11 Jun 2020 02:44:53 -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-131-8QHxEgQEPv6WJDqT_VjL5A-1; Thu, 11 Jun 2020 05:44:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 16AB0107ACF4; Thu, 11 Jun 2020 09:44:45 +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 E93431A92D; Thu, 11 Jun 2020 09:44:44 +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 BAF8E104809; Thu, 11 Jun 2020 09:44:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05B9hpFi030287 for ; Thu, 11 Jun 2020 05:43:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04F867C3B7; Thu, 11 Jun 2020 09:43:51 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71FBB78914 for ; Thu, 11 Jun 2020 09:43:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591868692; 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=FicEUfTcvVMw19UlPgXQUi6Be2cebdZWkypExT1rwsY=; b=QEgNiq66saHD9hD+ZgTw5hTlJ2QFmhPsYXUV1F/lE3nU0eYzBsve2/x82I2py0GDF5fveg uE108MwuoT8t7rbS+WnoLe4dRXpT1AEouSI7vMC+nTyyaQuU7G5jlKbXcitVnp/E240ZD4 5mm2/f5qLKbyjdwF/cyMgJD1SKM+AaI= X-MC-Unique: 8QHxEgQEPv6WJDqT_VjL5A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 7/7] Remove use of variables passed only to 'VIR_FREE' Date: Thu, 11 Jun 2020 11:43:39 +0200 Message-Id: <3a5b134c07b35e9c2025a9729126bb7aed056879.1591868343.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 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" Compilers are not very good at detecting this problem. Fixed by manual inspection of compilation warnings after replacing 'VIR_FREE' with an empty macro. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/locking/sanlock_helper.c | 2 -- src/logging/log_daemon.c | 2 -- src/nwfilter/nwfilter_ebiptables_driver.c | 2 -- src/openvz/openvz_driver.c | 2 -- src/security/security_selinux.c | 2 -- src/test/test_driver.c | 2 -- src/util/virstorageencryption.c | 4 ---- src/util/virsysinfo.c | 2 -- src/vmware/vmware_conf.c | 4 ---- src/vmware/vmware_driver.c | 4 ---- tests/networkxml2firewalltest.c | 2 -- tests/xmconfigtest.c | 2 -- tools/virsh-checkpoint.c | 2 -- 13 files changed, 32 deletions(-) diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index 50deccfd67..26f225e639 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -50,7 +50,6 @@ main(int argc, char **argv) const char *uri; const char *uuid; virDomainLockFailureAction action; - char *xml =3D NULL; virConnectPtr conn =3D NULL; virDomainPtr dom =3D NULL; int ret =3D EXIT_FAILURE; @@ -102,7 +101,6 @@ main(int argc, char **argv) virObjectUnref(dom); if (conn) virConnectClose(conn); - VIR_FREE(xml); return ret; } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 7017db2dcc..028f771f14 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -526,7 +526,6 @@ virLogDaemonPreExecRestart(const char *state_file, char *state =3D NULL; virJSONValuePtr object =3D virJSONValueNewObject(); char *magic; - virHashKeyValuePairPtr pairs =3D NULL; VIR_DEBUG("Running pre-restart exec"); @@ -577,7 +576,6 @@ virLogDaemonPreExecRestart(const char *state_file, abort(); /* This should be impossible to reach */ cleanup: - VIR_FREE(pairs); VIR_FREE(state); virJSONValueFree(object); return -1; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 235a002495..6fc8044c8d 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3368,7 +3368,6 @@ ebiptablesApplyNewRules(const char *ifname, bool haveEbtables =3D false; bool haveIptables =3D false; bool haveIp6tables =3D false; - char *errmsg =3D NULL; struct ebtablesSubChainInst **subchains =3D NULL; size_t nsubchains =3D 0; int ret =3D -1; @@ -3568,7 +3567,6 @@ ebiptablesApplyNewRules(const char *ifname, virHashFree(chains_in_set); virHashFree(chains_out_set); - VIR_FREE(errmsg); return ret; } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 0a08c63b1b..79a100c343 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -145,7 +145,6 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) { int ret =3D -1; int vpsid; - char * confdir =3D NULL; virCommandPtr cmd =3D NULL; if (vmdef->nfss > 1) { @@ -194,7 +193,6 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) ret =3D 0; cleanup: - VIR_FREE(confdir); virCommandFree(cmd); return ret; diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index e6819af26c..7359a45a96 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -812,7 +812,6 @@ virSecuritySELinuxGenLabel(virSecurityManagerPtr mgr, { int rc =3D -1; char *mcs =3D NULL; - char *scontext =3D NULL; context_t ctx =3D NULL; const char *range; virSecurityLabelDefPtr seclabel; @@ -949,7 +948,6 @@ virSecuritySELinuxGenLabel(virSecurityManagerPtr mgr, if (ctx) context_free(ctx); - VIR_FREE(scontext); VIR_FREE(mcs); VIR_FREE(sens); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 0dc91e1577..7a1db21718 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -8977,7 +8977,6 @@ testDomainCheckpointCreateXML(virDomainPtr domain, { testDriverPtr privconn =3D domain->conn->privateData; virDomainObjPtr vm =3D NULL; - char *xml =3D NULL; virDomainMomentObjPtr chk =3D NULL; virDomainCheckpointPtr checkpoint =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -9064,7 +9063,6 @@ testDomainCheckpointCreateXML(virDomainPtr domain, } virDomainObjEndAPI(&vm); - VIR_FREE(xml); return checkpoint; } diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryptio= n.c index 34c356b5a3..94ccaf1e9a 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -146,8 +146,6 @@ virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt); virStorageEncryptionSecretPtr ret; char *type_str =3D NULL; - char *uuidstr =3D NULL; - char *usagestr =3D NULL; if (VIR_ALLOC(ret) < 0) return NULL; @@ -177,8 +175,6 @@ virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, cleanup: VIR_FREE(type_str); virStorageEncryptionSecretFree(ret); - VIR_FREE(uuidstr); - VIR_FREE(usagestr); return NULL; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index dc052a7311..52e576f129 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -770,7 +770,6 @@ virSysinfoParseX86BaseBoard(const char *base, char *eol =3D NULL; virSysinfoBaseBoardDefPtr boards =3D NULL; size_t nboards =3D 0; - char *board_type =3D NULL; while (base && (cur =3D strstr(base, "Base Board Information"))) { virSysinfoBaseBoardDefPtr def; @@ -845,7 +844,6 @@ virSysinfoParseX86BaseBoard(const char *base, while (nboards--) virSysinfoBaseBoardDefClear(&boards[nboards]); VIR_FREE(boards); - VIR_FREE(board_type); return ret; } diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 8bea9c3b12..e44673247f 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -132,8 +132,6 @@ vmwareLoadDomains(struct vmware_driver *driver) char *vmxPath =3D NULL; char *vmx =3D NULL; vmwareDomainPtr pDomain; - char *directoryName =3D NULL; - char *fileName =3D NULL; int ret =3D -1; virVMXContext ctx; char *outbuf =3D NULL; @@ -197,8 +195,6 @@ vmwareLoadDomains(struct vmware_driver *driver) virCommandFree(cmd); VIR_FREE(outbuf); virDomainDefFree(vmdef); - VIR_FREE(directoryName); - VIR_FREE(fileName); VIR_FREE(vmx); virObjectUnref(vm); return ret; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 5b4057a8f6..e82edf2a11 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -400,8 +400,6 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; char *vmx =3D NULL; - char *directoryName =3D NULL; - char *fileName =3D NULL; char *vmxPath =3D NULL; vmwareDomainPtr pDomain =3D NULL; virVMXContext ctx; @@ -461,8 +459,6 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla cleanup: virDomainDefFree(vmdef); VIR_FREE(vmx); - VIR_FREE(directoryName); - VIR_FREE(fileName); VIR_FREE(vmxPath); if (vm) virObjectUnlock(vm); diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 0ad5e2303b..7b5ada7faa 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -61,7 +61,6 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, const char *baseargs) { - char *expectargv =3D NULL; char *actualargv =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virNetworkDefPtr def =3D NULL; @@ -94,7 +93,6 @@ static int testCompareXMLToArgvFiles(const char *xml, cleanup: virBufferFreeAndReset(&buf); - VIR_FREE(expectargv); VIR_FREE(actualargv); virNetworkDefFree(def); return ret; diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 6bd18d0fe1..e4a2b39384 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -129,7 +129,6 @@ testCompareHelper(const void *data) const struct testInfo *info =3D data; char *xml =3D NULL; char *cfg =3D NULL; - char *cfgout =3D NULL; xml =3D g_strdup_printf("%s/xmconfigdata/test-%s.xml", abs_srcdir, inf= o->name); cfg =3D g_strdup_printf("%s/xmconfigdata/test-%s.cfg", abs_srcdir, inf= o->name); @@ -141,7 +140,6 @@ testCompareHelper(const void *data) VIR_FREE(xml); VIR_FREE(cfg); - VIR_FREE(cfgout); return result; } diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index e82a67f075..853fe05fc4 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -471,7 +471,6 @@ cmdCheckpointInfo(vshControl *ctl, virDomainCheckpointPtr checkpoint =3D NULL; const char *name; char *parent =3D NULL; - char *xml =3D NULL; xmlDocPtr xmldoc =3D NULL; xmlXPathContextPtr ctxt =3D NULL; bool ret =3D false; @@ -518,7 +517,6 @@ cmdCheckpointInfo(vshControl *ctl, cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); - VIR_FREE(xml); VIR_FREE(parent); virshDomainCheckpointFree(checkpoint); virshDomainFree(dom); --=20 2.26.2