From nobody Sat May 18 23:23:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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=1571838008; cv=none; d=zoho.com; s=zohoarc; b=YNSMGBZnkEt465Yg9scf7cPpghzEc1j6lc/2A/kB4ahuXw9i79f8U6oBwJZWSJI3vVIJy3KiuLnkq4CkMeFrKX3vM4jhtIbl1GrZ9qsYPpo5fh+I60xS1/6iuELaKilNB9Q4qSKqIya4PugY60zZspLO2uB7n4fUJsYwXE1y2N0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571838008; 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=8TXP8EP1INOXtGOPMIHrTKdAzAFJCll/R6yqb7Znmk0=; b=Ot9kG7AGRReEf3utvUya02CPU86laLZUiRo1XSQVN8MmjhiW4BaJ+erCCwz8yQm9ctyi8Bg5WCfgbWqYEtGcAJaoPUu38krcpM7edq7v1pqTfiEyna7EgPZC4qDgDz8M9dS/iEmfuHl/k5DVf5VkZHM3En/B/CyzrHFXKJIElr4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571838008649875.0451106151323; Wed, 23 Oct 2019 06:40:08 -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-47-t3GM1arcMeC7S3vFOUa-_A-1; Wed, 23 Oct 2019 09:40:01 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7568C5ED; Wed, 23 Oct 2019 13:39:54 +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 79F855D712; Wed, 23 Oct 2019 13:39:52 +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 90FF44EE6D; Wed, 23 Oct 2019 13:39:50 +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 x9NDdnUQ028582 for ; Wed, 23 Oct 2019 09:39:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2DFB660624; Wed, 23 Oct 2019 13:39:49 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12BE06061E for ; Wed, 23 Oct 2019 13:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571838007; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8TXP8EP1INOXtGOPMIHrTKdAzAFJCll/R6yqb7Znmk0=; b=NlJDpQZuy0Ay0A827bbBqjKk3b1PB6i76Z0UsyWnfcfnN2jivsOlKEt+3Le/D5d/FvgSTK GoeZ2jhb4gPrCz92VCNNbCjaSBUX9646QEZ8Sr2355h3u1jXt9FZX3JSyhogfdPdmguj3a rRlUJiKrnhO5KhX/ZORxb2ciJivu++8= From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 23 Oct 2019 15:39:43 +0200 Message-Id: <733e41e5bc7a4f6673b5c192c22c0005d5fd477a.1571837947.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: t3GM1arcMeC7S3vFOUa-_A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Daniel Henrique Barboza --- src/bhyve/bhyve_driver.c | 38 +++++++++--------------- src/conf/checkpoint_conf.c | 5 +--- src/conf/domain_conf.c | 12 ++------ src/conf/snapshot_conf.c | 5 +--- src/conf/storage_conf.c | 17 ++++------- 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 | 19 ++++-------- src/qemu/qemu_driver.c | 19 ++++-------- src/qemu/qemu_firmware.c | 4 +-- src/qemu/qemu_monitor_json.c | 4 +-- src/qemu/qemu_process.c | 16 ++++------ src/qemu/qemu_vhost_user.c | 4 +-- src/remote/remote_daemon_dispatch.c | 5 +--- src/storage/storage_backend_iscsi.c | 5 +--- src/test/test_driver.c | 34 ++++++---------------- src/util/vircgroupv1.c | 6 +--- src/util/vircgroupv2.c | 6 +--- src/util/virdbus.c | 5 +--- src/util/virjson.c | 5 +--- src/util/virmdev.c | 5 +--- src/util/virscsi.c | 4 +-- src/util/virscsivhost.c | 5 +--- src/util/virstoragefile.c | 23 ++++----------- src/vbox/vbox_storage.c | 18 ++++-------- src/vz/vz_driver.c | 45 ++++++++++------------------- tests/qemuxml2argvmock.c | 5 +--- tests/virstoragetest.c | 4 +-- tools/virsh-completer-domain.c | 20 ++++--------- tools/virsh-completer-host.c | 8 ++--- 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 +--- 41 files changed, 143 insertions(+), 367 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index e3d984f69a..a2c8185c45 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 4fa743e0b0..90cb565d70 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 9ee9b44a5e..6aeef3e5c5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8322,7 +8322,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; @@ -8374,8 +8373,7 @@ virDomainNetIPParseXML(xmlNodePtr node) return NULL; } =20 - ret =3D g_steal_pointer(&ip); - return ret; + return g_steal_pointer(&ip); } =20 =20 @@ -9239,7 +9237,6 @@ virDomainStorageSourceParseBase(const char *type, const char *index) { g_autoptr(virStorageSource) src =3D NULL; - virStorageSourcePtr ret =3D NULL; =20 if (!(src =3D virStorageSourceNew())) return NULL; @@ -9267,8 +9264,7 @@ virDomainStorageSourceParseBase(const char *type, return NULL; } =20 - ret =3D g_steal_pointer(&src); - return ret; + return g_steal_pointer(&src); } =20 =20 @@ -18368,7 +18364,6 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node, static virBitmapPtr virDomainEmulatorPinDefParseXML(xmlNodePtr node) { - virBitmapPtr ret =3D NULL; g_autofree char *tmp =3D NULL; g_autoptr(virBitmap) def =3D NULL; =20 @@ -18387,8 +18382,7 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node) return NULL; } =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 =20 diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index f9fbca3c07..9f08965aab 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 f212eefe25..d493109b7d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -846,7 +846,6 @@ virStoragePoolDefPtr virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) { virStoragePoolOptionsPtr options; - virStoragePoolDefPtr ret =3D NULL; xmlNodePtr source_node; g_autoptr(virStoragePoolDef) def =3D NULL; g_autofree char *type =3D NULL; @@ -995,8 +994,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) return NULL; } =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 =20 @@ -1270,7 +1268,6 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, xmlXPathContextPtr ctxt, unsigned int flags) { - virStorageVolDefPtr ret =3D NULL; virStorageVolOptionsPtr options; xmlNodePtr node; size_t i; @@ -1430,8 +1427,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, VIR_FREE(nodes); } =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 =20 @@ -1689,14 +1685,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 5cc6b87b8c..c0e070d214 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 @@ -2776,29 +2770,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 @@ -5715,17 +5706,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 41a6a446bd..75c8c030c5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -348,59 +348,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 5df09a849e..fec3b4454c 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -703,7 +703,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, @@ -727,9 +726,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 fcaa6a48ae..5c212a2969 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3128,17 +3128,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 @@ -3148,17 +3144,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 @@ -3166,17 +3157,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 @@ -3186,16 +3173,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 41e0a1d5d9..cc3ce98cc5 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -704,19 +704,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 8b1d804233..7fe7745279 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3165,7 +3165,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]; @@ -3177,9 +3176,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 0160507737..4358734279 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -698,20 +698,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 @@ -10743,7 +10739,6 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainD= iskDefPtr disk, virQEMUCapsPtr qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; - qemuBlockStorageSourceAttachDataPtr ret =3D NULL; =20 if (VIR_ALLOC(data) < 0) return NULL; @@ -10752,9 +10747,7 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainD= iskDefPtr disk, !(data->driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; =20 - ret =3D g_steal_pointer(&data); - - return ret; + return g_steal_pointer(&data); } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af8cbf40f4..33a8c53d24 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1711,29 +1711,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 @@ -4079,7 +4073,6 @@ static char * getAutoDumpPath(virQEMUDriverPtr driver, virDomainObjPtr vm) { - char *dumpfile =3D NULL; g_autofree char *domname =3D virDomainDefGetShortName(vm->def); char timestr[100]; struct tm time_info; @@ -4094,9 +4087,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, localtime_r(&curtime, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); =20 - dumpfile =3D g_strdup_printf("%s/%s-%s", cfg->autoDumpPath, domname, t= imestr); - - return dumpfile; + return g_strdup_printf("%s/%s-%s", cfg->autoDumpPath, domname, timestr= ); } =20 static void diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 670662fd4b..be4a10689e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -616,7 +616,6 @@ qemuFirmwareParse(const char *path) g_autofree char *cont =3D NULL; g_autoptr(virJSONValue) doc =3D NULL; g_autoptr(qemuFirmware) fw =3D NULL; - qemuFirmwarePtr ret =3D NULL; =20 if (virFileReadAll(path, DOCUMENT_SIZE, &cont) < 0) return NULL; @@ -643,8 +642,7 @@ qemuFirmwareParse(const char *path) if (qemuFirmwareFeatureParse(path, doc, fw) < 0) return NULL; =20 - ret =3D g_steal_pointer(&fw); - return ret; + return g_steal_pointer(&fw); } =20 =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 99f55c420a..4bdc4d5569 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -9325,7 +9325,6 @@ qemuMonitorJSONGetJobInfoOne(virJSONValuePtr data) const char *errmsg =3D virJSONValueObjectGetString(data, "error"); int tmp; g_autoptr(qemuMonitorJobInfo) job =3D NULL; - qemuMonitorJobInfoPtr ret =3D NULL; =20 if (VIR_ALLOC(job) < 0) return NULL; @@ -9343,8 +9342,7 @@ qemuMonitorJSONGetJobInfoOne(virJSONValuePtr data) job->id =3D g_strdup(id); job->error =3D g_strdup(errmsg); =20 - ret =3D g_steal_pointer(&job); - return ret; + return g_steal_pointer(&job); } =20 =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e0dc26658..ed8666e9d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7304,8 +7304,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); @@ -7326,11 +7324,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 @@ -7752,11 +7748,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/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 789d29ce43..4c25b30664 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -184,7 +184,6 @@ qemuVhostUserParse(const char *path) g_autofree char *cont =3D NULL; g_autoptr(virJSONValue) doc =3D NULL; g_autoptr(qemuVhostUser) vu =3D NULL; - qemuVhostUserPtr ret =3D NULL; =20 if (virFileReadAll(path, DOCUMENT_SIZE, &cont) < 0) return NULL; @@ -205,8 +204,7 @@ qemuVhostUserParse(const char *path) if (qemuVhostUserBinaryParse(path, doc, vu) < 0) return NULL; =20 - ret =3D g_steal_pointer(&vu); - return ret; + return g_steal_pointer(&vu); } =20 =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 203aeff8c3..40d97e944a 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7492,10 +7492,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 e00a65d8bb..79320e6093 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4880,14 +4880,10 @@ testDomainGetPerfEvents(virDomainPtr dom, static char *testDomainGetSchedulerType(virDomainPtr domain G_GNUC_UNUSED, int *nparams) { - char *type =3D NULL; - if (nparams) *nparams =3D 1; =20 - type =3D g_strdup("fair"); - - return type; + return g_strdup("fair"); } =20 static int @@ -5264,11 +5260,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 @@ -5278,11 +5271,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 @@ -5290,11 +5280,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 @@ -5304,11 +5291,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 0820c5d638..3f10d8d127 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -401,11 +401,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 e976a8d241..e0362990ab 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -243,11 +243,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 89c9cb3e24..9afc5af194 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1177,15 +1177,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/util/virjson.c b/src/util/virjson.c index eb6207f13f..d8e80b6c64 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -2138,7 +2138,6 @@ virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json) { g_autoptr(virJSONValue) deflattened =3D NULL; - virJSONValuePtr ret =3D NULL; =20 if (!(deflattened =3D virJSONValueNewObject())) return NULL; @@ -2148,7 +2147,5 @@ virJSONValueObjectDeflatten(virJSONValuePtr json) deflattened) < 0) return NULL; =20 - ret =3D g_steal_pointer(&deflattened); - - return ret; + return g_steal_pointer(&deflattened); } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 9f8cb95423..f18a6dc2d0 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -140,7 +140,6 @@ virMediatedDeviceCheckModel(virMediatedDevicePtr dev, virMediatedDevicePtr virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) { - virMediatedDevicePtr ret =3D NULL; g_autoptr(virMediatedDevice) dev =3D NULL; g_autofree char *sysfspath =3D NULL; =20 @@ -165,9 +164,7 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDe= viceModelType model) return NULL; =20 dev->model =3D model; - ret =3D g_steal_pointer(&dev); - - return ret; + return g_steal_pointer(&dev); } =20 #else diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 705571f8ec..22360c91b9 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -184,7 +184,6 @@ virSCSIDeviceNew(const char *sysfs_prefix, bool shareable) { g_autoptr(virSCSIDevice) dev =3D NULL; - virSCSIDevicePtr ret =3D NULL; g_autofree char *sg =3D NULL; g_autofree char *vendor_path =3D NULL; g_autofree char *model_path =3D NULL; @@ -238,8 +237,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, if (virAsprintf(&dev->id, "%s:%s", vendor, model) < 0) return NULL; =20 - ret =3D g_steal_pointer(&dev); - return ret; + return g_steal_pointer(&dev); } =20 static void diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 5f523636be..4feef827b5 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -249,7 +249,6 @@ virSCSIVHostDevicePtr virSCSIVHostDeviceNew(const char *name) { g_autoptr(virSCSIVHostDevice) dev =3D NULL; - virSCSIVHostDevicePtr ret =3D NULL; =20 if (VIR_ALLOC(dev) < 0) return NULL; @@ -262,9 +261,7 @@ virSCSIVHostDeviceNew(const char *name) =20 VIR_DEBUG("%s: initialized", dev->name); =20 - ret =3D g_steal_pointer(&dev); - - return ret; + return g_steal_pointer(&dev); } =20 =20 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index be2b5479bb..f083eead3f 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1128,7 +1128,6 @@ virStorageFileMetadataNew(const char *path, int format) { g_autoptr(virStorageSource) def =3D NULL; - virStorageSourcePtr ret =3D NULL; =20 if (!(def =3D virStorageSourceNew())) return NULL; @@ -1138,8 +1137,7 @@ virStorageFileMetadataNew(const char *path, =20 def->path =3D g_strdup(path); =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 =20 @@ -1211,7 +1209,6 @@ virStorageFileGetMetadataFromFD(const char *path, int *backingFormat) =20 { - virStorageSourcePtr ret =3D NULL; ssize_t len =3D VIR_STORAGE_MAX_HEADER; struct stat sb; int dummy; @@ -1237,8 +1234,7 @@ virStorageFileGetMetadataFromFD(const char *path, * update the metadata.*/ meta->type =3D VIR_STORAGE_TYPE_DIR; meta->format =3D VIR_STORAGE_FILE_DIR; - ret =3D g_steal_pointer(&meta); - return ret; + return g_steal_pointer(&meta); } =20 if (lseek(fd, 0, SEEK_SET) =3D=3D (off_t)-1) { @@ -1259,8 +1255,7 @@ virStorageFileGetMetadataFromFD(const char *path, else if (S_ISBLK(sb.st_mode)) meta->type =3D VIR_STORAGE_TYPE_BLOCK; =20 - ret =3D g_steal_pointer(&meta); - return ret; + return g_steal_pointer(&meta); } =20 =20 @@ -1843,7 +1838,6 @@ virStorageAuthDefFree(virStorageAuthDefPtr authdef) virStorageAuthDefPtr virStorageAuthDefCopy(const virStorageAuthDef *src) { - virStorageAuthDefPtr ret =3D NULL; g_autoptr(virStorageAuthDef) authdef =3D NULL; =20 if (VIR_ALLOC(authdef) < 0) @@ -1857,8 +1851,7 @@ virStorageAuthDefCopy(const virStorageAuthDef *src) if (virSecretLookupDefCopy(&authdef->seclookupdef, &src->seclookupdef)= < 0) return NULL; =20 - ret =3D g_steal_pointer(&authdef); - return ret; + return g_steal_pointer(&authdef); } =20 =20 @@ -2228,7 +2221,6 @@ virStorageSourcePtr virStorageSourceCopy(const virStorageSource *src, bool backingChain) { - virStorageSourcePtr ret =3D NULL; g_autoptr(virStorageSource) def =3D NULL; =20 if (!(def =3D virStorageSourceNew())) @@ -2323,8 +2315,7 @@ virStorageSourceCopy(const virStorageSource *src, return NULL; } =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 =20 @@ -2604,7 +2595,6 @@ static virStorageSourcePtr virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, const char *rel) { - virStorageSourcePtr ret =3D NULL; g_autofree char *dirname =3D NULL; g_autoptr(virStorageSource) def =3D NULL; =20 @@ -2646,8 +2636,7 @@ virStorageSourceNewFromBackingRelative(virStorageSour= cePtr parent, def->type =3D VIR_STORAGE_TYPE_FILE; } =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 =20 diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index c7bea2c219..9bb3da4c57 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -91,10 +91,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)); @@ -102,7 +101,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) { @@ -119,9 +118,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPt= r pool) =20 gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); =20 - ret =3D hardDiskAccessible; - - return ret; + return hardDiskAccessible; } =20 static int @@ -132,10 +129,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)); @@ -143,7 +139,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) { @@ -175,9 +171,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 5b54f83b22..70084cc79e 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/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 34e0eb91a6..914d2bcf9f 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -198,10 +198,7 @@ virNetDevRunEthernetScript(const char *ifname G_GNUC_U= NUSED, char * virHostGetDRMRenderNode(void) { - char *dst =3D NULL; - - dst =3D g_strdup("/dev/dri/foo"); - return dst; + return g_strdup("/dev/dri/foo"); } =20 static void (*real_virCommandPassFD)(virCommandPtr cmd, int fd, unsigned i= nt flags); diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 8f1d93fa5a..32d12fd778 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -85,7 +85,6 @@ testStorageFileGetMetadata(const char *path, uid_t uid, gid_t gid) { struct stat st; - virStorageSourcePtr ret =3D NULL; g_autoptr(virStorageSource) def =3D NULL; =20 if (!(def =3D virStorageSourceNew())) @@ -107,8 +106,7 @@ testStorageFileGetMetadata(const char *path, if (virStorageFileGetMetadata(def, uid, gid, false) < 0) return NULL; =20 - ret =3D g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } =20 static int diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 6bfa3ab58c..7df08211b0 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -87,7 +87,6 @@ virshDomainInterfaceCompleter(vshControl *ctl, g_autofree xmlNodePtr *interfaces =3D NULL; size_t i; unsigned int domainXMLFlags =3D 0; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(VIRSH_DOMAIN_INTERFACE_COMPLETER_MAC, NULL); @@ -121,8 +120,7 @@ virshDomainInterfaceCompleter(vshControl *ctl, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 @@ -138,7 +136,6 @@ virshDomainDiskTargetCompleter(vshControl *ctl, int ndisks; size_t i; VIR_AUTOSTRINGLIST tmp =3D NULL; - char **ret =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -161,8 +158,7 @@ virshDomainDiskTargetCompleter(vshControl *ctl, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 @@ -172,7 +168,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); @@ -183,8 +178,7 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UN= USED, for (i =3D 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) tmp[i] =3D g_strdup(virshDomainEventCallbacks[i].name); =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 @@ -195,7 +189,6 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, { virshControlPtr priv =3D ctl->privData; const char *iface =3D NULL; - char **ret =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; virMacAddr macaddr; @@ -244,8 +237,7 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, tmp[0] =3D g_strdup("down"); } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 @@ -261,7 +253,6 @@ virshDomainDeviceAliasCompleter(vshControl *ctl, g_autofree xmlNodePtr *aliases =3D NULL; size_t i; unsigned int domainXMLFlags =3D 0; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -287,8 +278,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 42e59a6656..f795a2a826 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -64,7 +64,6 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, bool cellno =3D vshCommandOptBool(cmd, "cellno"); g_autofree char *path =3D NULL; g_autofree char *cap_xml =3D NULL; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -100,8 +99,7 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } =20 =20 @@ -117,7 +115,6 @@ virshCellnoCompleter(vshControl *ctl, g_autoptr(xmlDoc) doc =3D NULL; size_t i =3D 0; g_autofree char *cap_xml =3D NULL; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); @@ -143,6 +140,5 @@ virshCellnoCompleter(vshControl *ctl, return NULL; } =20 - ret =3D g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodede= v.c index 6b01941911..5425f11262 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -72,7 +72,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); @@ -83,8 +82,7 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_= UNUSED, for (i =3D 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) tmp[i] =3D g_strdup(virshNodeDeviceEventCallbacks[i].name); =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 bd9d9a9802..ed3b1e35ff 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -75,7 +75,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); @@ -86,8 +85,7 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, for (i =3D 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) tmp[i] =3D g_strdup(virshPoolEventCallbacks[i].name); =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 bb02577c82..a90fdb399f 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); @@ -84,6 +83,5 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUS= ED, for (i =3D 0; i < VIR_SECRET_EVENT_ID_LAST; i++) tmp[i] =3D g_strdup(virshSecretEventCallbacks[i].name); =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 3f8b7f2186..ec46b822c5 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2898,10 +2898,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