From nobody Thu May 2 17:22:33 2024 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=1571300879; cv=none; d=zoho.com; s=zohoarc; b=NBAv0mvzpBJlKP+/zdChD+WRKl9Ps3AJpT9tdhVb31NkqBJ8RciM8eeQ9b7HDUCIL83d8IVvwCMVMeuGVv8f2nMPRXErYBmFVlJun8LS4m+X8szLJ4/axp+jwjdBUp06l3klRM5LnME8Kn3Hytvn5F0ttsepY33YB/WsXf5x6AA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571300879; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=v8BVzqtozTvfCQq0BCsGzUYxKsI2AWjVQSQOdjx1b0s=; b=jC3+Uog5JC30F+fi95W5rtmIpRiK7tX3zMH5OSAQXxp0DgG2oot0o5UXvCjqmoZ43TB95WWvt6dmUAOqaeFzE79iK5LLD6zdClQ2zbtsT8GaI7a/W9G3zO9WXmxQC1+ICOyedXiwq8MJREys/uvThni+qJxSUJBzqOXjv6PKHz0= 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 1571300879407744.4477293606467; Thu, 17 Oct 2019 01:27:59 -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 3790E10CC205; Thu, 17 Oct 2019 08:27:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8779C600C4; Thu, 17 Oct 2019 08:27:56 +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 5042B1800B74; Thu, 17 Oct 2019 08:27:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9H8Rsj5016066 for ; Thu, 17 Oct 2019 04:27:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4213F5C207; Thu, 17 Oct 2019 08:27:54 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 724C65C1D6 for ; Thu, 17 Oct 2019 08:27:47 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 17 Oct 2019 10:22:52 +0200 Message-Id: <811724cb6deb20f093b7ac06828f9dfb71cb33c5.1571300558.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Drop needless @ret variable 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-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.65]); Thu, 17 Oct 2019 08:27:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" In few places we have the following code pattern: int ret; ... /* @ret is not accessed here */ ret =3D f(...); return ret; This pattern can be written less verbose: ... return f(...); This patch was generated with following coccinelle spatch: @@ type T; constant C; expression f; identifier ret; @@ -T ret =3D C; ... when !=3D ret -ret =3D f; -return ret; +return f; Afterwards I needed to fix a few places, e.g. comment in virDomainNetIPParseXML() was removed too because coccinelle thinks it refers to @ret while in fact it doesn't. Also in few places it replaced @ret declaration with a few spaces instead of removing the line. But nothing terribly wrong. Signed-off-by: Michal Privoznik --- src/bhyve/bhyve_driver.c | 38 +++++++++--------------- src/conf/checkpoint_conf.c | 5 +--- src/conf/domain_conf.c | 4 +-- src/conf/snapshot_conf.c | 5 +--- src/conf/storage_conf.c | 9 ++---- src/conf/virnwfilterbindingobj.c | 5 +--- src/libvirt-stream.c | 7 ++--- src/libxl/libxl_driver.c | 36 ++++++++--------------- src/lxc/lxc_driver.c | 36 ++++++++--------------- src/lxc/lxc_native.c | 5 +--- src/network/bridge_driver.c | 38 +++++++----------------- src/nwfilter/nwfilter_driver.c | 10 ++----- src/phyp/phyp_driver.c | 5 +--- src/qemu/qemu_command.c | 14 ++++----- src/qemu/qemu_driver.c | 14 +++------ src/qemu/qemu_process.c | 16 ++++------ src/remote/remote_daemon_dispatch.c | 5 +--- src/storage/storage_backend_iscsi.c | 5 +--- src/test/test_driver.c | 28 +++++------------- src/util/vircgroupv1.c | 6 +--- src/util/vircgroupv2.c | 6 +--- src/util/virdbus.c | 5 +--- src/vbox/vbox_storage.c | 18 ++++-------- src/vz/vz_driver.c | 45 ++++++++++------------------- tools/virsh-completer-domain.c | 4 +-- tools/virsh-completer-nodedev.c | 4 +-- tools/virsh-completer-pool.c | 4 +-- tools/virsh-completer-secret.c | 4 +-- tools/virsh-network.c | 5 +--- tools/vsh.c | 5 +--- 30 files changed, 115 insertions(+), 276 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 52e1895052..2e4f03d841 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -630,30 +630,24 @@ static int bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids) { bhyveConnPtr privconn =3D conn->privateData; - int n; =20 if (virConnectListDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, + virConnectListDomainsCheckACL, con= n); } =20 static int bhyveConnectNumOfDomains(virConnectPtr conn) { bhyveConnPtr privconn =3D conn->privateData; - int count; =20 if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; =20 - count =3D virDomainObjListNumOfDomains(privconn->domains, true, - virConnectNumOfDomainsCheckACL, c= onn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, true, + virConnectNumOfDomainsCheckACL, co= nn); } =20 static int @@ -661,31 +655,28 @@ bhyveConnectListDefinedDomains(virConnectPtr conn, ch= ar **const names, int maxnames) { bhyveConnPtr privconn =3D conn->privateData; - int n; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; =20 memset(names, 0, sizeof(*names) * maxnames); - n =3D virDomainObjListGetInactiveNames(privconn->domains, names, - maxnames, virConnectListDefinedDo= mainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(privconn->domains, names, + maxnames, + virConnectListDefinedDomainsCh= eckACL, + conn); } =20 static int bhyveConnectNumOfDefinedDomains(virConnectPtr conn) { bhyveConnPtr privconn =3D conn->privateData; - int count; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - count =3D virDomainObjListNumOfDomains(privconn->domains, false, - virConnectNumOfDefinedDomainsChec= kACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, false, + virConnectNumOfDefinedDomainsCheck= ACL, + conn); } =20 static char * @@ -771,17 +762,14 @@ bhyveConnectListAllDomains(virConnectPtr conn, unsigned int flags) { bhyveConnPtr privconn =3D conn->privateData; - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; =20 - ret =3D virDomainObjListExport(privconn->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(privconn->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } =20 static virDomainPtr diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index b254dce7fd..586528a974 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -73,13 +73,10 @@ virDomainCheckpointDiskDefClear(virDomainCheckpointDisk= DefPtr disk) virDomainCheckpointDefPtr virDomainCheckpointDefNew(void) { - virDomainCheckpointDefPtr def; - if (virDomainCheckpointInitialize() < 0) return NULL; =20 - def =3D virObjectNew(virDomainCheckpointDefClass); - return def; + return virObjectNew(virDomainCheckpointDefClass); } =20 static void diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e6a113de3..d1c2ad5484 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8306,7 +8306,6 @@ static virNetDevIPAddrPtr virDomainNetIPParseXML(xmlNodePtr node) { /* Parse the prefix in every case */ - virNetDevIPAddrPtr ret =3D NULL; unsigned int prefixValue =3D 0; int family =3D AF_UNSPEC; g_autofree virNetDevIPAddrPtr ip =3D NULL; @@ -8358,8 +8357,7 @@ virDomainNetIPParseXML(xmlNodePtr node) return NULL; } =20 - ret =3D g_steal_pointer(&ip); - return ret; + return g_steal_pointer(&ip); } =20 =20 diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 0e9d307321..1992cc1b08 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -113,13 +113,10 @@ virDomainSnapshotDiskDefFree(virDomainSnapshotDiskDef= Ptr disk) virDomainSnapshotDefPtr virDomainSnapshotDefNew(void) { - virDomainSnapshotDefPtr def; - if (virDomainSnapshotInitialize() < 0) return NULL; =20 - def =3D virObjectNew(virDomainSnapshotDefClass); - return def; + return virObjectNew(virDomainSnapshotDefClass); } =20 static void diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9e4978b560..c115729ec7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1692,14 +1692,11 @@ virStoragePoolSaveXML(const char *path, const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - int ret =3D -1; =20 virUUIDFormat(def->uuid, uuidstr); - ret =3D virXMLSaveFile(path, - virXMLPickShellSafeComment(def->name, uuidstr), - "pool-edit", xml); - - return ret; + return virXMLSaveFile(path, + virXMLPickShellSafeComment(def->name, uuidstr), + "pool-edit", xml); } =20 =20 diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 48d53fafb1..24aafa99c3 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -91,10 +91,7 @@ virNWFilterBindingObjSetDef(virNWFilterBindingObjPtr obj, virNWFilterBindingDefPtr virNWFilterBindingObjStealDef(virNWFilterBindingObjPtr obj) { - virNWFilterBindingDefPtr def; - - def =3D g_steal_pointer(&obj->def); - return def; + return g_steal_pointer(&obj->def); } =20 =20 diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index fb646d0aef..6f6bb5df0b 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -520,11 +520,8 @@ virStreamInData(virStreamPtr stream, virCheckNonNullArgReturn(data, -1); virCheckNonNullArgReturn(length, -1); =20 - if (stream->driver->streamInData) { - int ret; - ret =3D (stream->driver->streamInData)(stream, data, length); - return ret; - } + if (stream->driver->streamInData) + return (stream->driver->streamInData)(stream, data, length); =20 virReportUnsupportedError(); return -1; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 64b21f2073..a1c752c25b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1009,30 +1009,24 @@ static int libxlConnectListDomains(virConnectPtr conn, int *ids, int nids) { libxlDriverPrivatePtr driver =3D conn->privateData; - int n; =20 if (virConnectListDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, con= n); } =20 static int libxlConnectNumOfDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver =3D conn->privateData; - int n; =20 if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, co= nn); } =20 static virDomainPtr @@ -2777,29 +2771,26 @@ libxlConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { libxlDriverPrivatePtr driver =3D conn->privateData; - int n; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheck= ACL, conn); - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCh= eckACL, + conn); } =20 static int libxlConnectNumOfDefinedDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver =3D conn->privateData; - int n; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheck= ACL, + conn); } =20 static int @@ -5717,17 +5708,14 @@ libxlConnectListAllDomains(virConnectPtr conn, unsigned int flags) { libxlDriverPrivatePtr driver =3D conn->privateData; - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; =20 - ret =3D virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } =20 /* Which features are supported by this driver? */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 204a3ed522..4edbe6e299 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -347,59 +347,49 @@ static int lxcDomainIsUpdated(virDomainPtr dom) static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { virLXCDriverPtr driver =3D conn->privateData; - int n; =20 if (virConnectListDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, con= n); } =20 static int lxcConnectNumOfDomains(virConnectPtr conn) { virLXCDriverPtr driver =3D conn->privateData; - int n; =20 if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, co= nn); } =20 static int lxcConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virLXCDriverPtr driver =3D conn->privateData; - int n; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheck= ACL, conn); - - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCh= eckACL, + conn); } =20 =20 static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) { virLXCDriverPtr driver =3D conn->privateData; - int n; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL= , conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheck= ACL, + conn); } =20 =20 @@ -3254,16 +3244,14 @@ lxcConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virLXCDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; =20 - ret =3D virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } =20 =20 diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 8ae3c7b006..3ac5e34ee1 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -718,7 +718,6 @@ static int lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) { int status; - int result =3D -1; size_t i; lxcNetworkParseData data =3D {def, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, @@ -742,9 +741,7 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfP= tr properties) /* When no network type is provided LXC only adds loopback */ def->features[VIR_DOMAIN_FEATURE_PRIVNET] =3D VIR_TRISTATE_SWITCH_= ON; } - result =3D 0; - - return result; + return 0; =20 error: for (i =3D 0; i < data.nips; i++) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6862818698..e6881965c1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3136,17 +3136,13 @@ static int networkConnectNumOfNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int nactive; =20 if (virConnectNumOfNetworksEnsureACL(conn) < 0) return -1; =20 - nactive =3D virNetworkObjListNumOfNetworks(driver->networks, - true, - virConnectNumOfNetworksCheckA= CL, - conn); - - return nactive; + return virNetworkObjListNumOfNetworks(driver->networks, true, + virConnectNumOfNetworksCheckACL, + conn); } =20 =20 @@ -3156,17 +3152,12 @@ networkConnectListNetworks(virConnectPtr conn, int maxnames) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int got =3D 0; =20 if (virConnectListNetworksEnsureACL(conn) < 0) return -1; =20 - got =3D virNetworkObjListGetNames(driver->networks, - true, names, maxnames, - virConnectListNetworksCheckACL, - conn); - - return got; + return virNetworkObjListGetNames(driver->networks, true, names, maxnam= es, + virConnectListNetworksCheckACL, conn); } =20 =20 @@ -3174,17 +3165,13 @@ static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int ninactive =3D 0; =20 if (virConnectNumOfDefinedNetworksEnsureACL(conn) < 0) return -1; =20 - ninactive =3D virNetworkObjListNumOfNetworks(driver->networks, - false, - virConnectNumOfDefinedNetwo= rksCheckACL, - conn); - - return ninactive; + return virNetworkObjListNumOfNetworks(driver->networks, false, + virConnectNumOfDefinedNetworksCh= eckACL, + conn); } =20 =20 @@ -3194,16 +3181,13 @@ networkConnectListDefinedNetworks(virConnectPtr con= n, int maxnames) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int got =3D 0; =20 if (virConnectListDefinedNetworksEnsureACL(conn) < 0) return -1; =20 - got =3D virNetworkObjListGetNames(driver->networks, - false, names, maxnames, - virConnectListDefinedNetworksCheckACL, - conn); - return got; + return virNetworkObjListGetNames(driver->networks, false, names, maxna= mes, + virConnectListDefinedNetworksCheckACL, + conn); } =20 =20 diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index fbdf250934..2e906555b9 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -707,19 +707,13 @@ nwfilterConnectListAllNWFilterBindings(virConnectPtr = conn, virNWFilterBindingPtr **bindings, unsigned int flags) { - int ret; - virCheckFlags(0, -1); =20 if (virConnectListAllNWFilterBindingsEnsureACL(conn) < 0) return -1; =20 - ret =3D virNWFilterBindingObjListExport(driver->bindings, - conn, - bindings, - virConnectListAllNWFilterBinding= sCheckACL); - - return ret; + return virNWFilterBindingObjListExport(driver->bindings, conn, binding= s, + virConnectListAllNWFilterBindin= gsCheckACL); } =20 =20 diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4527adc670..67193d6359 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3174,7 +3174,6 @@ phypDomainLookupByName(virConnectPtr conn, const char= *lpar_name) { phyp_driverPtr phyp_driver =3D conn->privateData; LIBSSH2_SESSION *session =3D phyp_driver->session; - virDomainPtr dom =3D NULL; int lpar_id =3D 0; char *managed_system =3D phyp_driver->managed_system; unsigned char lpar_uuid[VIR_UUID_BUFLEN]; @@ -3186,9 +3185,7 @@ phypDomainLookupByName(virConnectPtr conn, const char= *lpar_name) if (phypGetLparUUID(lpar_uuid, lpar_id, conn) =3D=3D -1) return NULL; =20 - dom =3D virGetDomain(conn, lpar_name, lpar_uuid, lpar_id); - - return dom; + return virGetDomain(conn, lpar_name, lpar_uuid, lpar_id); } =20 static virDomainPtr diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e98195b1d7..6886a07154 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -697,20 +697,16 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo, virJSONValuePtr *propsret) { - int ret =3D -1; g_autofree char *keyid =3D NULL; =20 if (!(keyid =3D qemuDomainGetMasterKeyAlias())) return -1; =20 - ret =3D qemuMonitorCreateObjectProps(propsret, - "secret", secinfo->s.aes.alias, - "s:data", secinfo->s.aes.ciphertext, - "s:keyid", keyid, - "s:iv", secinfo->s.aes.iv, - "s:format", "base64", NULL); - - return ret; + return qemuMonitorCreateObjectProps(propsret, "secret", + secinfo->s.aes.alias, "s:data", + secinfo->s.aes.ciphertext, "s:keyi= d", + keyid, "s:iv", secinfo->s.aes.iv, + "s:format", "base64", NULL); } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cafd5c0fc7..f93f987833 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1761,29 +1761,23 @@ static char *qemuConnectGetHostname(virConnectPtr c= onn) static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { virQEMUDriverPtr driver =3D conn->privateData; - int n; =20 if (virConnectListDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, con= n); } =20 static int qemuConnectNumOfDomains(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - int n; =20 if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, co= nn); } =20 =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index aaca2fc7d6..b10fdc0379 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7316,8 +7316,6 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, int qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { - int ret; - VIR_DEBUG("vm=3D%p name=3D%s pid=3D%lld flags=3D0x%x", vm, vm->def->name, (long long)vm->pid, flags); @@ -7338,11 +7336,9 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int fla= gs) =20 /* Request an extra delay of two seconds per current nhostdevs * to be safe against stalls by the kernel freeing up the resources */ - ret =3D virProcessKillPainfullyDelay(vm->pid, - !!(flags & VIR_QEMU_PROCESS_KILL_FO= RCE), - vm->def->nhostdevs * 2); - - return ret; + return virProcessKillPainfullyDelay(vm->pid, + !!(flags & VIR_QEMU_PROCESS_KILL_F= ORCE), + vm->def->nhostdevs * 2); } =20 =20 @@ -7764,11 +7760,9 @@ int qemuProcessAutoDestroyAdd(virQEMUDriverPtr drive= r, int qemuProcessAutoDestroyRemove(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret; VIR_DEBUG("vm=3D%s", vm->def->name); - ret =3D virCloseCallbacksUnset(driver->closeCallbacks, vm, - qemuProcessAutoDestroy); - return ret; + return virCloseCallbacksUnset(driver->closeCallbacks, vm, + qemuProcessAutoDestroy); } =20 bool qemuProcessAutoDestroyActive(virQEMUDriverPtr driver, diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 56a46a13be..18b2e16a8f 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7512,10 +7512,7 @@ get_nonnull_storage_pool(virConnectPtr conn, remote_= nonnull_storage_pool pool) static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol) { - virStorageVolPtr ret; - ret =3D virGetStorageVol(conn, vol.pool, vol.name, vol.key, - NULL, NULL); - return ret; + return virGetStorageVol(conn, vol.pool, vol.name, vol.key, NULL, NULL); } =20 static virSecretPtr diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_back= end_iscsi.c index b11d1d6622..c754b5958c 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -227,7 +227,6 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr po= ol, bool *isActive) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); - int ret =3D -1; g_autofree char *session =3D NULL; =20 *isActive =3D false; @@ -253,9 +252,7 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr po= ol, =20 if ((session =3D virStorageBackendISCSISession(pool, true))) *isActive =3D true; - ret =3D 0; - - return ret; + return 0; } =20 =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ab7e5fc02a..f81af5d629 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5270,11 +5270,8 @@ static int testConnectNumOfNetworks(virConnectPtr conn) { testDriverPtr privconn =3D conn->privateData; - int numActive; - - numActive =3D virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return numActive; + return virNetworkObjListNumOfNetworks(privconn->networks, true, NULL, + conn); } =20 =20 @@ -5284,11 +5281,8 @@ testConnectListNetworks(virConnectPtr conn, int maxnames) { testDriverPtr privconn =3D conn->privateData; - int n; - - n =3D virNetworkObjListGetNames(privconn->networks, - true, names, maxnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, true, names, + maxnames, NULL, conn); } =20 =20 @@ -5296,11 +5290,8 @@ static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { testDriverPtr privconn =3D conn->privateData; - int numInactive; - - numInactive =3D virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return numInactive; + return virNetworkObjListNumOfNetworks(privconn->networks, false, NULL, + conn); } =20 =20 @@ -5310,11 +5301,8 @@ testConnectListDefinedNetworks(virConnectPtr conn, int maxnames) { testDriverPtr privconn =3D conn->privateData; - int n; - - n =3D virNetworkObjListGetNames(privconn->networks, - false, names, maxnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, false, names, + maxnames, NULL, conn); } =20 =20 diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 6ab79a1897..4d09d84274 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -410,11 +410,7 @@ virCgroupV1ValidatePlacement(virCgroupPtr group, static char * virCgroupV1StealPlacement(virCgroupPtr group) { - char *ret =3D NULL; - - ret =3D g_steal_pointer(&group->legacy[VIR_CGROUP_CONTROLLER_SYSTEMD].= placement); - - return ret; + return g_steal_pointer(&group->legacy[VIR_CGROUP_CONTROLLER_SYSTEMD].p= lacement); } =20 =20 diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 621ab71eb5..c89158d5d5 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -242,11 +242,7 @@ virCgroupV2ValidatePlacement(virCgroupPtr group, static char * virCgroupV2StealPlacement(virCgroupPtr group) { - char *ret; - - ret =3D g_steal_pointer(&group->unified.placement); - - return ret; + return g_steal_pointer(&group->unified.placement); } =20 =20 diff --git a/src/util/virdbus.c b/src/util/virdbus.c index f54c917c03..50a6bea05e 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1178,15 +1178,12 @@ virDBusMessageEncodeArgs(DBusMessage* msg, va_list args) { DBusMessageIter iter; - int ret =3D -1; =20 memset(&iter, 0, sizeof(iter)); =20 dbus_message_iter_init_append(msg, &iter); =20 - ret =3D virDBusMessageIterEncode(&iter, types, args); - - return ret; + return virDBusMessageIterEncode(&iter, types, args); } =20 =20 diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index ba5b876ffb..3d221fa8d9 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -90,10 +90,9 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr= pool) PRUint32 hardDiskAccessible =3D 0; nsresult rc; size_t i; - int ret =3D -1; =20 if (!data->vboxObj) - return ret; + return -1; =20 rc =3D gVBoxAPI.UArray.vboxArrayGet(&hardDisks, data->vboxObj, gVBoxAPI.UArray.handleGetHardDisks(d= ata->vboxObj)); @@ -101,7 +100,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPt= r pool) virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get number of volumes in the pool: %s,= rc=3D%08x"), pool->name, (unsigned)rc); - return ret; + return -1; } =20 for (i =3D 0; i < hardDisks.count; ++i) { @@ -118,9 +117,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPt= r pool) =20 gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); =20 - ret =3D hardDiskAccessible; - - return ret; + return hardDiskAccessible; } =20 static int @@ -131,10 +128,9 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, cha= r **const names, int nname PRUint32 numActive =3D 0; nsresult rc; size_t i; - int ret =3D -1; =20 if (!data->vboxObj) - return ret; + return -1; =20 rc =3D gVBoxAPI.UArray.vboxArrayGet(&hardDisks, data->vboxObj, gVBoxAPI.UArray.handleGetHardDisks(d= ata->vboxObj)); @@ -142,7 +138,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char= **const names, int nname virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get the volume list in the pool: %s, r= c=3D%08x"), pool->name, (unsigned)rc); - return ret; + return -1; } =20 for (i =3D 0; i < hardDisks.count && numActive < nnames; ++i) { @@ -174,9 +170,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char= **const names, int nname } =20 gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret =3D numActive; - - return ret; + return numActive; } =20 static virStorageVolPtr diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 21425346ac..69ec1a5377 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -210,13 +210,11 @@ static char * vzConnectGetCapabilities(virConnectPtr conn) { vzConnPtr privconn =3D conn->privateData; - char *xml; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; =20 - xml =3D virCapabilitiesFormatXML(privconn->driver->caps); - return xml; + return virCapabilitiesFormatXML(privconn->driver->caps); } =20 static int @@ -470,63 +468,53 @@ static int vzConnectListDomains(virConnectPtr conn, int *ids, int maxids) { vzConnPtr privconn =3D conn->privateData; - int n; =20 if (virConnectListDomainsEnsureACL(conn) < 0) return -1; =20 - n =3D virDomainObjListGetActiveIDs(privconn->driver->domains, ids, max= ids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(privconn->driver->domains, ids, + maxids, virConnectListDomainsCheck= ACL, + conn); } =20 static int vzConnectNumOfDomains(virConnectPtr conn) { vzConnPtr privconn =3D conn->privateData; - int count; =20 if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; =20 - count =3D virDomainObjListNumOfDomains(privconn->driver->domains, true, - virConnectNumOfDomainsCheckACL, c= onn); - - return count; + return virDomainObjListNumOfDomains(privconn->driver->domains, true, + virConnectNumOfDomainsCheckACL, co= nn); } =20 static int vzConnectListDefinedDomains(virConnectPtr conn, char **const names, int ma= xnames) { vzConnPtr privconn =3D conn->privateData; - int n; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; =20 memset(names, 0, sizeof(*names) * maxnames); - n =3D virDomainObjListGetInactiveNames(privconn->driver->domains, name= s, - maxnames, - virConnectListDefinedDomainsCheck= ACL, - conn); - - return n; + return virDomainObjListGetInactiveNames(privconn->driver->domains, nam= es, + maxnames, + virConnectListDefinedDomainsCh= eckACL, + conn); } =20 static int vzConnectNumOfDefinedDomains(virConnectPtr conn) { vzConnPtr privconn =3D conn->privateData; - int count; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - count =3D virDomainObjListNumOfDomains(privconn->driver->domains, fals= e, - virConnectNumOfDefinedDomainsChec= kACL, - conn); - return count; + return virDomainObjListNumOfDomains(privconn->driver->domains, false, + virConnectNumOfDefinedDomainsCheck= ACL, + conn); } =20 static int @@ -535,17 +523,14 @@ vzConnectListAllDomains(virConnectPtr conn, unsigned int flags) { vzConnPtr privconn =3D conn->privateData; - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; =20 - ret =3D virDomainObjListExport(privconn->driver->domains, conn, domain= s, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(privconn->driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } =20 static virDomainPtr diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index bb06f468d7..641b26d2c5 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -173,7 +173,6 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UN= USED, unsigned int flags) { size_t i =3D 0; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -186,8 +185,7 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UN= USED, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodede= v.c index 899c199902..83f6d415a7 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -73,7 +73,6 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_= UNUSED, unsigned int flags) { size_t i =3D 0; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -86,8 +85,7 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_= UNUSED, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c index ceb73eed06..def2b95b6d 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -76,7 +76,6 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i =3D 0; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -89,8 +88,7 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c index a533ac178f..4ebeaeeb65 100644 --- a/tools/virsh-completer-secret.c +++ b/tools/virsh-completer-secret.c @@ -73,7 +73,6 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUS= ED, unsigned int flags) { size_t i; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -86,6 +85,5 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUS= ED, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 64b733adcc..edd61f3217 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1384,8 +1384,6 @@ static const vshCmdOptDef opts_network_dhcp_leases[] = =3D { static int virshNetworkDHCPLeaseSorter(const void *a, const void *b) { - int rv =3D -1; - virNetworkDHCPLeasePtr *lease1 =3D (virNetworkDHCPLeasePtr *) a; virNetworkDHCPLeasePtr *lease2 =3D (virNetworkDHCPLeasePtr *) b; =20 @@ -1395,8 +1393,7 @@ virshNetworkDHCPLeaseSorter(const void *a, const void= *b) if (!*lease1) return *lease2 !=3D NULL; =20 - rv =3D vshStrcasecmp((*lease1)->mac, (*lease2)->mac); - return rv; + return vshStrcasecmp((*lease1)->mac, (*lease2)->mac); } =20 static bool diff --git a/tools/vsh.c b/tools/vsh.c index ee675a63cc..ae94a724df 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2910,10 +2910,7 @@ vshReadlineCompletion(const char *text, int start G_GNUC_UNUSED, int end G_GNUC_UNUSED) { - char **matches =3D (char **) NULL; - - matches =3D rl_completion_matches(text, vshReadlineParse); - return matches; + return rl_completion_matches(text, vshReadlineParse); } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list