From nobody Sun May 5 16:22:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1634899514; cv=none; d=zohomail.com; s=zohoarc; b=TsLKdT4epwzSlZ4R0px8vlmvK/wJgy3T/lOlU2fX5oNwApTlpCKzJAy/a84z3hYQhzgouLxQ1W3KfUKvon3S2sWIUslNByVD+GfWNUNb1SlgdY1RVOYSp/PdDMqDVpzRaCRckVXXKx/sMVPkOvduXYJDRvZJRLXswlY6ZmOw0Yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634899514; 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=xYB8+iI3bXcUXnUZOMXyZXNmMMvwSQ2DegODFl2ApNc=; b=mLgBYw9RzWKpAvS/cCi30uos4cxmt6buyxn0W3ZrLfRS3hsuFD+TD+hvjHkYG/3thbtpK32dbGPpvxhvMFmi+ZO/LEt1/ySO30YPDepMIWaMnw0nMxztEuyKZTg+SwU0g6BGYks8QPjtgqUL9+SVIemmZVg80OxNVTg1s4bbPVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1634899514515337.8222846590139; Fri, 22 Oct 2021 03:45:14 -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-436-Pee4ZD-hOV6mGYOvfGy-0A-1; Fri, 22 Oct 2021 06:45:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B4AB10A8E00; Fri, 22 Oct 2021 10:45:04 +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 A14E57944C; Fri, 22 Oct 2021 10:45:02 +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 19D0D4A704; Fri, 22 Oct 2021 10:44:59 +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 19MAiuU2000948 for ; Fri, 22 Oct 2021 06:44:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB4811B5C0; Fri, 22 Oct 2021 10:44:56 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 087A960862 for ; Fri, 22 Oct 2021 10:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634899513; 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=xYB8+iI3bXcUXnUZOMXyZXNmMMvwSQ2DegODFl2ApNc=; b=QARzLTeDfLqY4mzRcpGVbotRp6UI3fLsdtDnpxcKKmsZ+uysXCHOJmlImDXvx/tu3yMZUH xaSRvK9HzU7syZ+j4ABV17IuYrj0E6Tafw5L/pvPazmu7P6xlM2vgCBg8qZ2mUOfFwunuS pgV5AlTaBf1kAsUBiawJN5/VaHFmpE4= X-MC-Unique: Pee4ZD-hOV6mGYOvfGy-0A-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] lib: Drop intermediary return variables Date: Fri, 22 Oct 2021 12:44:46 +0200 Message-Id: <94aace3e1211bf3a0d0d68b504377ab6b3a0efa6.1634899486.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 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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634899515231100001 Content-Type: text/plain; charset="utf-8" In a few places we declare a variable (which is optionally followed by a code not touching it) then set the variable to a value and return the variable immediately. It's obvious that the variable is needless and the value can be returned directly instead. This patch was generated using this semantic patch: @@ type T; identifier ret; expression E; @@ - T ret; ... when !=3D ret when strict - ret =3D E; - return ret; + return E; After that I fixed couple of formatting issues because coccinelle formatted some lines differently than our coding style. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/bhyve/bhyve_domain.c | 6 +----- src/conf/domain_addr.c | 6 +----- src/conf/domain_conf.c | 5 +---- src/conf/virnetworkobj.c | 4 +--- src/conf/virnwfilterbindingobj.c | 5 +---- src/conf/virnwfilterobj.c | 5 +---- src/esx/esx_driver.c | 5 +---- src/esx/esx_storage_backend_iscsi.c | 5 +---- src/esx/esx_storage_backend_vmfs.c | 5 +---- src/hyperv/hyperv_driver.c | 5 +---- src/locking/lock_daemon.c | 5 +---- src/locking/lock_driver_sanlock.c | 6 ++---- src/logging/log_daemon.c | 5 +---- src/network/bridge_driver.c | 27 +++++---------------------- src/qemu/qemu_alias.c | 24 ++++-------------------- src/qemu/qemu_command.c | 15 ++++++--------- src/qemu/qemu_domain.c | 10 +++------- src/qemu/qemu_monitor.c | 5 +---- src/security/security_apparmor.c | 5 +---- src/security/security_nop.c | 5 +---- src/test/test_driver.c | 9 ++------- src/util/viraudit.c | 4 +--- src/util/virfirewall.c | 6 +----- src/util/virmacmap.c | 6 +----- src/util/virnetdev.c | 5 +---- src/util/virpci.c | 10 ++-------- src/vbox/vbox_common.c | 7 +++---- tests/bhyvexml2argvmock.c | 5 +---- tests/qemumonitortestutils.c | 5 +---- tests/qemusecuritymock.c | 6 +----- tests/qemuxml2argvmock.c | 5 +---- tests/virnetserverclienttest.c | 6 +----- tests/virpcimock.c | 8 ++------ tests/virusbmock.c | 4 +--- 34 files changed, 54 insertions(+), 190 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 33e74e2e25..b526235a4e 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -36,11 +36,7 @@ VIR_LOG_INIT("bhyve.bhyve_domain"); static void * bhyveDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { - bhyveDomainObjPrivate *priv; - - priv =3D g_new0(bhyveDomainObjPrivate, 1); - - return priv; + return g_new0(bhyveDomainObjPrivate, 1); } =20 static void diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index fe6520cf3a..a06721c35d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1862,11 +1862,7 @@ virDomainUSBAddressPortFormat(unsigned int *port) virDomainUSBAddressSet * virDomainUSBAddressSetCreate(void) { - virDomainUSBAddressSet *addrs; - - addrs =3D g_new0(virDomainUSBAddressSet, 1); - - return addrs; + return g_new0(virDomainUSBAddressSet, 1); } =20 =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 15228d1e38..1b36699761 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28879,10 +28879,7 @@ char *virDomainConfigFile(const char *dir, const char *name) { - char *ret; - - ret =3D g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } =20 /* Translates a device name of the form (regex) "[fhv]d[a-z]+" into diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index aa629af6f6..f1baffc516 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1601,9 +1601,7 @@ char * virNetworkObjGetPortStatusDir(virNetworkObj *net, const char *stateDir) { - char *ret; - ret =3D g_strdup_printf("%s/%s/ports", stateDir, net->def->name); - return ret; + return g_strdup_printf("%s/%s/ports", stateDir, net->def->name); } =20 int diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 29fbb63b5f..acea240b5d 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -138,10 +138,7 @@ char * virNWFilterBindingObjConfigFile(const char *dir, const char *name) { - char *ret; - - ret =3D g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } =20 =20 diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c3b2eb048c..6bbdf6e6fa 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -117,10 +117,7 @@ virNWFilterObjListFree(virNWFilterObjList *nwfilters) virNWFilterObjList * virNWFilterObjListNew(void) { - virNWFilterObjList *nwfilters; - - nwfilters =3D g_new0(virNWFilterObjList, 1); - return nwfilters; + return g_new0(virNWFilterObjList, 1); } =20 =20 diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5d9687733f..ee752662ec 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1800,10 +1800,7 @@ esxDomainDestroy(virDomainPtr dom) static char * esxDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { - char *osType; - - osType =3D g_strdup("hvm"); - return osType; + return g_strdup("hvm"); } =20 =20 diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_back= end_iscsi.c index d89b5a4ba8..043de1690d 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -766,10 +766,7 @@ esxStorageVolWipe(virStorageVolPtr volume G_GNUC_UNUSE= D, static char * esxStorageVolGetPath(virStorageVolPtr volume) { - char *path; - - path =3D g_strdup(volume->name); - return path; + return g_strdup(volume->name); } =20 =20 diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backe= nd_vmfs.c index cb2be59a33..5dba813111 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -1392,10 +1392,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, static char * esxStorageVolGetPath(virStorageVolPtr volume) { - char *path; - - path =3D g_strdup_printf("[%s] %s", volume->pool, volume->name); - return path; + return g_strdup_printf("[%s] %s", volume->pool, volume->name); } =20 =20 diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index a672901a81..3e6360f2a7 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -2234,10 +2234,7 @@ hypervDomainDestroy(virDomainPtr domain) static char * hypervDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { - char *osType; - - osType =3D g_strdup("hvm"); - return osType; + return g_strdup("hvm"); } =20 =20 diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index fa08acbc76..faca4a2485 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -616,10 +616,7 @@ virLockDaemonExecRestartStatePath(bool privileged, static char * virLockDaemonGetExecRestartMagic(void) { - char *ret; - - ret =3D g_strdup_printf("%lld", (long long int)getpid()); - return ret; + return g_strdup_printf("%lld", (long long int)getpid()); } =20 =20 diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 46e2cbc4f0..2dceb1eefc 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -174,13 +174,11 @@ static int virLockManagerSanlockInitLockspace(virLockManagerSanlockDriver *driver, struct sanlk_lockspace *ls) { - int ret; - const int max_hosts =3D 0; /* defaults used in sanlock_init() implemen= tation */ const unsigned int lockspaceFlags =3D 0; =20 - ret =3D sanlock_write_lockspace(ls, max_hosts, lockspaceFlags, driver-= >io_timeout); - return ret; + return sanlock_write_lockspace(ls, max_hosts, lockspaceFlags, + driver->io_timeout); } =20 /* How many times try adding a lockspace? */ diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 1b04fbdae8..cc7889399b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -423,10 +423,7 @@ virLogDaemonExecRestartStatePath(bool privileged, static char * virLogDaemonGetExecRestartMagic(void) { - char *ret; - - ret =3D g_strdup_printf("%lld", (long long int)getpid()); - return ret; + return g_strdup_printf("%lld", (long long int)getpid()); } =20 =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7027dc636c..498c45d0a7 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -365,10 +365,7 @@ static char * networkDnsmasqLeaseFileNameDefault(virNetworkDriverState *driver, const char *netname) { - char *leasefile; - - leasefile =3D g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir,= netname); - return leasefile; + return g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir, netnam= e); } =20 =20 @@ -376,10 +373,7 @@ static char * networkDnsmasqLeaseFileNameCustom(virNetworkDriverState *driver, const char *bridge) { - char *leasefile; - - leasefile =3D g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir,= bridge); - return leasefile; + return g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir, bridge= ); } =20 =20 @@ -387,21 +381,13 @@ static char * networkDnsmasqConfigFileName(virNetworkDriverState *driver, const char *netname) { - char *conffile; - - conffile =3D g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, ne= tname); - return conffile; + return g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, netname); } =20 =20 static char * networkRadvdPidfileBasename(const char *netname) -{ - /* this is simple but we want to be sure it's consistently done */ - char *pidfilebase; - - pidfilebase =3D g_strdup_printf("%s-radvd", netname); - return pidfilebase; +{return g_strdup_printf("%s-radvd", netname); } =20 =20 @@ -409,10 +395,7 @@ static char * networkRadvdConfigFileName(virNetworkDriverState *driver, const char *netname) { - char *configfile; - - configfile =3D g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateD= ir, netname); - return configfile; + return g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateDir, netn= ame); } =20 =20 diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 276a03cb56..a36f346592 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -804,11 +804,7 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostde= v) char * qemuDomainGetMasterKeyAlias(void) { - char *alias; - - alias =3D g_strdup("masterKey0"); - - return alias; + return g_strdup("masterKey0"); } =20 =20 @@ -837,11 +833,7 @@ qemuAliasForSecret(const char *parentalias, char * qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { - char *ret; - - ret =3D g_strdup_printf("obj%s_tls0", srcAlias); - - return ret; + return g_strdup_printf("obj%s_tls0", srcAlias); } =20 =20 @@ -853,11 +845,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) char * qemuAliasChardevFromDevAlias(const char *devAlias) { - char *ret; - - ret =3D g_strdup_printf("char%s", devAlias); - - return ret; + return g_strdup_printf("char%s", devAlias); } =20 =20 @@ -871,11 +859,7 @@ qemuDomainGetManagedPRAlias(void) char * qemuDomainGetUnmanagedPRAlias(const char *parentalias) { - char *ret; - - ret =3D g_strdup_printf("pr-helper-%s", parentalias); - - return ret; + return g_strdup_printf("pr-helper-%s", parentalias); } =20 =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6df50ec73..335bad5616 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3811,18 +3811,15 @@ qemuBuildMemoryDeviceProps(const virDomainDef *def, static char * qemuBuildLegacyNicStr(virDomainNetDef *net) { - char *str; char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel =3D virDomainNetGetModelString(net); =20 - str =3D g_strdup_printf("nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=3D" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=3D" : ""), - NULLSTR_EMPTY(net->info.alias)); - return str; + return g_strdup_printf("nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, netmodel ? ",model=3D" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=3D" : ""), + NULLSTR_EMPTY(net->info.alias)); } =20 =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e719c7b8c7..d0cb2eebed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5944,13 +5944,9 @@ qemuDomainDefFromXML(virQEMUDriver *driver, virQEMUCaps *qemuCaps, const char *xml) { - virDomainDef *def; - - def =3D virDomainDefParseString(xml, driver->xmlopt, qemuCaps, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); - - return def; + return virDomainDefParseString(xml, driver->xmlopt, qemuCaps, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); } =20 =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6b6d6cd613..81d9087839 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -920,10 +920,7 @@ qemuMonitorClose(qemuMonitor *mon) char * qemuMonitorNextCommandID(qemuMonitor *mon) { - char *id; - - id =3D g_strdup_printf("libvirt-%d", ++mon->nextSerial); - return id; + return g_strdup_printf("libvirt-%d", ++mon->nextSerial); } =20 =20 diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 2cc15ba6af..dadcfd67db 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1169,10 +1169,7 @@ static char * AppArmorGetMountOptions(virSecurityManager *mgr G_GNUC_UNUSED, virDomainDef *vm G_GNUC_UNUSED) { - char *opts; - - opts =3D g_strdup(""); - return opts; + return g_strdup(""); } =20 static const char * diff --git a/src/security/security_nop.c b/src/security/security_nop.c index a634e7f3fe..0b3d37142a 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -178,10 +178,7 @@ static char * virSecurityDomainGetMountOptionsNop(virSecurityManager *mgr G_GNUC_UNUSED, virDomainDef *vm G_GNUC_UNUSED) { - char *opts; - - opts =3D g_strdup(""); - return opts; + return g_strdup(""); } =20 static const char * diff --git a/src/test/test_driver.c b/src/test/test_driver.c index b5413cc03d..fd7486b8ca 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1666,7 +1666,6 @@ static char * testConnectGetSysinfo(virConnectPtr conn G_GNUC_UNUSED, unsigned int flags) { - char *ret; const char *sysinfo =3D "\n" " \n" " LENOVO\n" @@ -1678,8 +1677,7 @@ testConnectGetSysinfo(virConnectPtr conn G_GNUC_UNUSE= D, =20 virCheckFlags(0, NULL); =20 - ret =3D g_strdup(sysinfo); - return ret; + return g_strdup(sysinfo); } =20 static const char * @@ -2706,10 +2704,7 @@ testDomainCoreDump(virDomainPtr domain, static char * testDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { - char *ret; - - ret =3D g_strdup("linux"); - return ret; + return g_strdup("linux"); } =20 =20 diff --git a/src/util/viraudit.c b/src/util/viraudit.c index bbd2462897..76ad3a73ed 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -140,8 +140,6 @@ char *virAuditEncode(const char *key, const char *value) #if WITH_AUDIT return audit_encode_nv_string(key, value, 0); #else - char *str; - str =3D g_strdup_printf("%s=3D%s", key, value); - return str; + return g_strdup_printf("%s=3D%s", key, value); #endif } diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index fb02992912..1a546335f6 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -157,11 +157,7 @@ virFirewallSetBackend(virFirewallBackend backend) static virFirewallGroup * virFirewallGroupNew(void) { - virFirewallGroup *group; - - group =3D g_new0(virFirewallGroup, 1); - - return group; + return g_new0(virFirewallGroup, 1); } =20 =20 diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 297d57a931..fb16062cd1 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -267,11 +267,7 @@ char * virMacMapFileName(const char *dnsmasqStateDir, const char *bridge) { - char *filename; - - filename =3D g_strdup_printf("%s/%s.macs", dnsmasqStateDir, bridge); - - return filename; + return g_strdup_printf("%s/%s.macs", dnsmasqStateDir, bridge); } =20 =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5b4c585716..58f7360a0f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2803,10 +2803,7 @@ static int virNetDevGetMulticastTable(const char *if= name, virNetDevRxFilter * virNetDevRxFilterNew(void) { - virNetDevRxFilter *filter; - - filter =3D g_new0(virNetDevRxFilter, 1); - return filter; + return g_new0(virNetDevRxFilter, 1); } =20 =20 diff --git a/src/util/virpci.c b/src/util/virpci.c index e746a2b25b..2d12e28004 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1438,14 +1438,8 @@ void virPCIDeviceAddressCopy(virPCIDeviceAddress *ds= t, char * virPCIDeviceAddressAsString(const virPCIDeviceAddress *addr) { - char *str; - - str =3D g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, - addr->bus, - addr->slot, - addr->function); - return str; + return g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, + addr->bus, addr->slot, addr->function); } =20 bool diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 7334254a36..45e7225ae1 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2699,16 +2699,15 @@ static int vboxDomainDestroy(virDomainPtr dom) return vboxDomainDestroyFlags(dom, 0); } =20 -static char *vboxDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { +static char *vboxDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) +{ /* Returning "hvm" always as suggested on list, cause * this functions seems to be badly named and it * is supposed to pass the ABI name and not the domain * operating system driver as I had imagined ;) */ - char *osType; =20 - osType =3D g_strdup("hvm"); - return osType; + return g_strdup("hvm"); } =20 static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index f3820ef032..9b77f97e5f 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -74,10 +74,7 @@ int virNetDevTapCreateInBridgePort(const char *brname G_= GNUC_UNUSED, =20 char *virNetDevTapGetRealDeviceName(char *name G_GNUC_UNUSED) { - char *fakename; - - fakename =3D g_strdup("faketapdev"); - return fakename; + return g_strdup("faketapdev"); } =20 int virNetDevSetOnline(const char *ifname G_GNUC_UNUSED, diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 35a1bce071..75a6a76b92 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1282,13 +1282,10 @@ qemuMonitorTestFullAddItem(qemuMonitorTest *test, size_t line) { g_autofree char *cmderr =3D NULL; - int ret; =20 cmderr =3D g_strdup_printf("wrong expected command in %s:%zu: ", filen= ame, line); =20 - ret =3D qemuMonitorTestAddItemVerbatim(test, command, cmderr, response= ); - - return ret; + return qemuMonitorTestAddItemVerbatim(test, command, cmderr, response); } =20 =20 diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 87aadf564e..f092383b62 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -128,11 +128,7 @@ static char * get_key(const char *path, const char *name) { - char *ret; - - ret =3D g_strdup_printf("%s:%s", path, name); - - return ret; + return g_strdup_printf("%s:%s", path, name); } =20 =20 diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 2265492f1e..f4e2f52680 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -107,12 +107,9 @@ virNumaNodesetIsAvailable(virBitmap *nodeset) char * virTPMCreateCancelPath(const char *devpath) { - char *path; (void)devpath; =20 - path =3D g_strdup("/sys/class/misc/tpm0/device/cancel"); - - return path; + return g_strdup("/sys/class/misc/tpm0/device/cancel"); } =20 /** diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index 942901bf60..d3c817f70d 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -30,11 +30,7 @@ static void * testClientNew(virNetServerClient *client G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { - char *dummy; - - dummy =3D g_new0(char, 1); - - return dummy; + return g_new0(char, 1); } =20 =20 diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 0f8d5ad54f..f65ae7c0c5 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -351,12 +351,8 @@ remove_fd(int fd) static char * pci_address_format(struct pciDeviceAddress const *addr) { - char *ret; - - ret =3D g_strdup_printf(ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function); - return ret; + return g_strdup_printf(ADDR_STR_FMT, addr->domain, addr->bus, + addr->device, addr->function); } =20 static int diff --git a/tests/virusbmock.c b/tests/virusbmock.c index a1f539b8b1..5b09895197 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -64,14 +64,12 @@ static char *get_fake_path(const char *real_path) DIR *opendir(const char *name) { g_autofree char *path =3D NULL; - DIR* ret; =20 init_syms(); =20 path =3D get_fake_path(name); =20 - ret =3D realopendir(path); - return ret; + return realopendir(path); } =20 int open(const char *pathname, int flags, ...) --=20 2.32.0