From nobody Thu May 2 22:21:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588605211; cv=none; d=zohomail.com; s=zohoarc; b=GM+yUVa2kpuIHBA39I3bbKkbRC1S8ljyj4apIosAorIHaM40nAzuvBXxpduu6xgTI//cOL6LCW/FzXOXH5OauIEfFYsm4A8Ov9EDPoO+SPNSGWw8CBvH+M75WNBNQiuDRXRSd3tZjutafRlJpZST7YtxO3y3SY2PzyffTVgPiDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588605211; 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=HpI2BxslVinkVjkVLhHxxpba7ANvfZRHgPoVutzwZm8=; b=EFBxbyDRpsOsHl/4W6lP3sQZ2A7uPxw1e6AmxF6pBCQlB/k5ze5glTHBavFU0UnKqN2iZ8b1DIh+ywOCST9pHowM1YSRglT8UQzlICDBizehIi5sf9JQKjzU7HG36CY6oQTcr7pPEu5O5DY6eRlDHsW0WSO+DMF3tIRyhUvZze4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1588605211616734.3108046530605; Mon, 4 May 2020 08:13:31 -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-58-STv_d7PiOX6Aw4rn4S5tdA-1; Mon, 04 May 2020 11:13:26 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6D6F1005510; Mon, 4 May 2020 15:13:20 +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 3B9222C277; Mon, 4 May 2020 15:13:19 +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 8C8131809542; Mon, 4 May 2020 15:13:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044FDFU2032529 for ; Mon, 4 May 2020 11:13:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 531DA9CB9; Mon, 4 May 2020 15:13:15 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70AF464421 for ; Mon, 4 May 2020 15:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588605209; 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=HpI2BxslVinkVjkVLhHxxpba7ANvfZRHgPoVutzwZm8=; b=S+LN+HIdZfMAIOT9r2x1zQ7QQVSX48D+XPgeBRnbYQn4cWgtL5czA126O2A0q1EO+jY03y Bf+uofvfdK08pj2pNSAsRZ21YYRiDFRp/Bb/p+qqasFY5OroQhvrVu4FTtSAedTH1J2lH8 2WxPO8chAT+y1NetcruHJJc+gegE1Tc= X-MC-Unique: STv_d7PiOX6Aw4rn4S5tdA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] Drop needless variable Date: Mon, 4 May 2020 17:13:08 +0200 Message-Id: <89eaa24f5477545de2715740985f729f7614387a.1588605156.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Instead of the following pattern: type ret; ... ret =3D func(); return ret; we can use: return func() directly. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/domain_addr.c | 8 +------- src/conf/domain_conf.c | 8 +++----- src/conf/network_conf.c | 5 +---- src/conf/virnetworkportdef.c | 5 +---- src/qemu/qemu_capabilities.c | 5 +---- src/qemu/qemu_command.c | 8 ++------ src/qemu/qemu_conf.c | 9 ++------- src/qemu/qemu_domain.c | 12 +++--------- src/qemu/qemu_driver.c | 18 ++++++------------ src/qemu/qemu_tpm.c | 11 ++--------- src/security/security_apparmor.c | 5 +---- src/security/security_util.c | 9 +++------ src/storage/storage_driver.c | 7 ++----- src/util/vircgroup.c | 5 +---- src/util/virmdev.c | 10 ++-------- src/util/virresctrl.c | 6 +----- src/util/virsocketaddr.c | 5 +---- src/util/virutil.c | 8 +++----- tests/qemuxml2argvtest.c | 6 +----- 19 files changed, 37 insertions(+), 113 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5652bc9a33..8623e79daf 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1392,13 +1392,7 @@ virDomainPCIAddressSetAllMulti(virDomainDefPtr def) static char* virDomainCCWAddressAsString(virDomainDeviceCCWAddressPtr addr) { - char *addrstr =3D NULL; - - addrstr =3D g_strdup_printf("%x.%x.%04x", - addr->cssid, - addr->ssid, - addr->devno); - return addrstr; + return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->de= vno); } =20 static int diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8a87586936..83748354b0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31316,54 +31316,52 @@ char * virDomainDefGetShortName(const virDomainDef *def) { wchar_t wshortname[VIR_DOMAIN_SHORT_NAME_MAX + 1] =3D {0}; size_t len =3D 0; - char *ret =3D NULL; g_autofree char *shortname =3D NULL; =20 /* No need to do the whole conversion thing when there are no multibyte * characters. The same applies for illegal sequences as they can occ= ur * with incompatible locales. */ len =3D mbstowcs(NULL, def->name, 0); if ((len =3D=3D (size_t) -1 && errno =3D=3D EILSEQ) || len =3D=3D strlen(def->name)) { - ret =3D g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_= MAX, def->name); - return ret; + return g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_M= AX, + def->name); } =20 if (len =3D=3D (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } =20 if (mbstowcs(wshortname, def->name, VIR_DOMAIN_SHORT_NAME_MAX) =3D=3D = (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } =20 len =3D wcstombs(NULL, wshortname, 0); if (len =3D=3D (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); return NULL; } =20 if (VIR_ALLOC_N(shortname, len + 1) < 0) return NULL; =20 if (wcstombs(shortname, wshortname, len) =3D=3D (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); return NULL; } =20 - ret =3D g_strdup_printf("%d-%s", def->id, shortname); - return ret; + return g_strdup_printf("%d-%s", def->id, shortname); } =20 #undef VIR_DOMAIN_SHORT_NAME_MAX diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index a7c177f8db..dc64ce6959 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2892,10 +2892,7 @@ char * virNetworkConfigFile(const char *dir, const char *name) { - char *ret =3D NULL; - - 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/virnetworkportdef.c b/src/conf/virnetworkportdef.c index a4cffea8b6..2013e11dff 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -432,10 +432,7 @@ static char * virNetworkPortDefConfigFile(const char *dir, const char *name) { - char *ret =3D NULL; - - 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/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47f88481c8..c7e58f92ae 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4467,79 +4467,76 @@ char * virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; - char *ret =3D NULL; size_t i; =20 virBufferAddLit(&buf, "\n"); virBufferAdjustIndent(&buf, 2); =20 virBufferEscapeString(&buf, "%s\n", qemuCaps->binary); virBufferAsprintf(&buf, "%llu\n", (long long)qemuCaps->ctime); virBufferAsprintf(&buf, "%llu\n", (long long)qemuCaps->libvirtCtime); virBufferAsprintf(&buf, "%lu\n", (unsigned long)qemuCaps->libvirtVersion); =20 for (i =3D 0; i < QEMU_CAPS_LAST; i++) { if (virQEMUCapsGet(qemuCaps, i)) { virBufferAsprintf(&buf, "\n", virQEMUCapsTypeToString(i)); } } =20 virBufferAsprintf(&buf, "%d\n", qemuCaps->version); =20 virBufferAsprintf(&buf, "%d\n", qemuCaps->kvmVersion); =20 virBufferAsprintf(&buf, "%u\n", qemuCaps->microcodeVersion); =20 if (qemuCaps->package) virBufferAsprintf(&buf, "%s\n", qemuCaps->package); =20 if (qemuCaps->kernelVersion) virBufferAsprintf(&buf, "%s\n", qemuCaps->kernelVersion); =20 virBufferAsprintf(&buf, "%s\n", virArchToString(qemuCaps->arch)); =20 virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU); =20 for (i =3D 0; i < qemuCaps->ngicCapabilities; i++) { virGICCapabilityPtr cap; bool kernel; bool emulated; =20 cap =3D &qemuCaps->gicCapabilities[i]; kernel =3D (cap->implementation & VIR_GIC_IMPLEMENTATION_KERNEL); emulated =3D (cap->implementation & VIR_GIC_IMPLEMENTATION_EMULATE= D); =20 virBufferAsprintf(&buf, "\n", cap->version, kernel ? "yes" : "no", emulated ? "yes" : "no"); } =20 if (qemuCaps->sevCapabilities) virQEMUCapsFormatSEVInfo(qemuCaps, &buf); =20 if (qemuCaps->kvmSupportsNesting) virBufferAddLit(&buf, "\n"); =20 virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); =20 - ret =3D virBufferContentAndReset(&buf); - - return ret; + return virBufferContentAndReset(&buf); } =20 =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6acfc0b19d..269bdbaf56 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -251,44 +251,40 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, static char * qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) { - char *result =3D NULL; int idx =3D virCommandPassFDGetFDIndex(cmd, fd); =20 if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), f= d); return NULL; } =20 - result =3D g_strdup_printf("set=3D%d,fd=3D%d", idx, fd); - return result; + return g_strdup_printf("set=3D%d,fd=3D%d", idx, fd); } =20 =20 /** * qemuVirCommandGetDevSet: * @cmd: the command to modify * @fd: fd to reassign to the child * * Get the parameters for the QEMU path=3D parameter where a file * descriptor is accessed via a file descriptor set, for example * /dev/fdset/10. The file descriptor must previously have been * 'transferred' in a virCommandPassFD() call. */ static char * qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) { - char *result =3D NULL; int idx =3D virCommandPassFDGetFDIndex(cmd, fd); =20 if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), f= d); return NULL; } =20 - result =3D g_strdup_printf("/dev/fdset/%d", idx); - return result; + return g_strdup_printf("/dev/fdset/%d", idx); } =20 =20 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c59824006c..2d5e527b47 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1429,29 +1429,26 @@ char * qemuGetSharedDeviceKey(const char *device_path) { int maj, min; - char *key =3D NULL; int rc; =20 if ((rc =3D virGetDeviceID(device_path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get minor number of device '%s'"= ), device_path); return NULL; } =20 - key =3D g_strdup_printf("%d:%d", maj, min); - - return key; + return g_strdup_printf("%d:%d", maj, min); } =20 /* * Make necessary checks for the need to check and for the current setting * of the 'unpriv_sgio' value for the device_path passed. * * Returns: * 0 - Success * -1 - Some failure which would already have been messaged * -2 - Mismatch with the "shared" sgio setting - needs to be messaged * by caller since it has context of which type of disk resource is * being used and in the future the hostdev information. */ @@ -1704,19 +1701,17 @@ static char * qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) { virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.sc= si; virDomainHostdevSubsysSCSIHostPtr scsihostsrc =3D &scsisrc->u.host; g_autofree char *dev_name =3D NULL; - char *dev_path =3D NULL; =20 if (!(dev_name =3D virSCSIDeviceGetDevName(NULL, scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit))) return NULL; =20 - dev_path =3D g_strdup_printf("/dev/%s", dev_name); - return dev_path; + return g_strdup_printf("/dev/%s", dev_name); } =20 =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d63ec2313b..9c629c31a3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6835,17 +6835,14 @@ virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, virDomainDefPtr src, unsigned int flags) { - virDomainDefPtr ret =3D NULL; g_autofree char *xml =3D NULL; =20 if (!(xml =3D qemuDomainDefFormatXML(driver, qemuCaps, src, flags))) return NULL; =20 - ret =3D qemuDomainDefFromXML(driver, qemuCaps, xml); - - return ret; + return qemuDomainDefFromXML(driver, qemuCaps, xml); } =20 =20 @@ -13364,17 +13361,14 @@ qemuProcessEventFree(struct qemuProcessEvent *eve= nt) char * qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv) { - char *ret =3D NULL; - - ret =3D g_strdup_printf("%s/%s.sock", priv->libDir, qemuDomainGetManag= edPRAlias()); - - return ret; + return g_strdup_printf("%s/%s.sock", priv->libDir, + qemuDomainGetManagedPRAlias()); } =20 =20 /** * qemuDomainStorageIdNew: * @priv: qemu VM private data object. * * Generate a new unique id for a storage object. Useful for node name gen= eration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d5aeeac66d..1c7c87128d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7439,31 +7439,25 @@ static char *qemuConnectDomainXMLToNative(virConnec= tPtr conn, static int qemuConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - ret =3D virDomainObjListGetInactiveNames(driver->domains, names, nname= s, - virConnectListDefinedDomainsChe= ckACL, - conn); - - return ret; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCh= eckACL, + conn); } =20 static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; =20 - ret =3D virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckA= CL, - conn); - - return ret; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheck= ACL, + conn); } =20 =20 diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 58dfdf689a..fe567f440c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -171,19 +171,15 @@ static char * qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, const char *shortName) { - char *path =3D NULL; - - path =3D g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); - - return path; + return g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); } =20 =20 /* * qemuTPMEmulatorInitPaths: * * @tpm: TPM definition for an emulator type * @swtpmStorageDir: the general swtpm storage dir which is used as a base * directory for creating VM specific directories * @uuid: the UUID of the VM */ @@ -213,25 +209,22 @@ static char * qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir, const char *shortName) { - char *pidfile =3D NULL; g_autofree char *devicename =3D NULL; =20 devicename =3D g_strdup_printf("%s-swtpm", shortName); =20 - pidfile =3D virPidFileBuildPath(swtpmStateDir, devicename); - - return pidfile; + return virPidFileBuildPath(swtpmStateDir, devicename); } =20 =20 /* * qemuTPMEmulatorGetPid * * @swtpmStateDir: the directory where swtpm writes the pidfile into * @shortName: short name of the domain * @pid: pointer to pid * * Return -1 upon error, or zero on successful reading of the pidfile. * If the PID was not still alive, zero will be returned, and @pid will be * set to -1; */ diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 3bc200ffb3..7c8fd39584 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -213,15 +213,12 @@ static char * get_profile_name(virDomainDefPtr def) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *name =3D NULL; =20 virUUIDFormat(def->uuid, uuidstr); - name =3D g_strdup_printf("%s%s", AA_PREFIX, uuidstr); - - return name; + return g_strdup_printf("%s%s", AA_PREFIX, uuidstr); } =20 /* returns -1 on error or profile for libvirtd is unconfined, 0 if complain * mode and 1 if enforcing. This is required because at present you cannot * aa_change_profile() from a process that is unconfined. */ diff --git a/src/security/security_util.c b/src/security/security_util.c index 4f661fd75e..7fa5163fe4 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -92,9 +92,8 @@ virSecurityGetRefCountAttrName(const char *name G_GNUC_UN= USED) static char * virSecurityGetTimestampAttrName(const char *name) { - char *ret =3D NULL; - ret =3D g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%= s", name); - return ret; + return g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%s= ", + name); } #else /* !XATTR_NAMESPACE */ static char * @@ -112,49 +111,47 @@ static char * virSecurityGetTimestamp(void) { unsigned long long boottime =3D 0; - char *ret =3D NULL; =20 if (virHostGetBootTime(&boottime) < 0) { virReportSystemError(errno, "%s", _("Unable to get host boot time")); return NULL; } =20 - ret =3D g_strdup_printf("%llu", boottime); - return ret; + return g_strdup_printf("%llu", boottime); } =20 =20 /** * virSecurityValidateTimestamp: * @name: security driver name * @path: file name * * Check if remembered label on @path for security driver @name * is valid, i.e. the label has been set since the last boot. If * the label was set in previous runs, all XATTRs related to * @name are removed so that clean slate is restored. * * This is done having extra attribute timestamp_$SECDRIVER which * contains the host boot time. Its value is then compared to * actual host boot time. If these two values don't match then * XATTRs are considered as stale and thus invalid. * * In ideal world, where there network file systems have XATTRs * using plain host boot time is not enough as it may lead to a * situation where a freshly started host sees XATTRs, sees the * timestamp put there by some longer running host and considers * the XATTRs invalid. Well, there is not an easy way out. We * would need to somehow check if the longer running host is * still there and uses the @path (how?). * Fortunately, there is only one network file system which * supports XATTRs currently (GlusterFS via FUSE) and it is used * so rarely that it's almost a corner case. * The worst thing that happens there is that we remove XATTRs * and thus return @path to the default label for $SECDRIVER. * * Returns: 0 if remembered label is valid, * 1 if remembered label was not valid, * -2 if underlying file system doesn't support XATTRs, * -1 otherwise. */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2db763caa5..7e82c09be5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2837,13 +2837,10 @@ char * virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, virStorageVolDefPtr voldef) =20 { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); - char *tmp =3D NULL; - - tmp =3D g_strdup_printf("%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name); - return tmp; + return g_strdup_printf("%s/%s.%s.secret.XXXXXX", driver->stateDir, + def->name, voldef->name); } =20 =20 diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 70d85200cb..bb535df4f2 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -423,28 +423,25 @@ virCgroupDetect(virCgroupPtr group, char * virCgroupGetBlockDevString(const char *path) { - char *ret =3D NULL; struct stat sb; =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Path '%s' is not accessible"), path); return NULL; } =20 if (!S_ISBLK(sb.st_mode)) { virReportSystemError(EINVAL, _("Path '%s' must be a block device"), path); return NULL; } =20 /* Automatically append space after the string since all callers * use it anyway */ - ret =3D g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)= ); - - return ret; + return g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); } =20 =20 diff --git a/src/util/virmdev.c b/src/util/virmdev.c index c2499c0a20..51a88a91d7 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -206,31 +206,28 @@ char * virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) { g_autofree char *result_path =3D NULL; g_autofree char *result_file =3D NULL; g_autofree char *iommu_path =3D NULL; g_autofree char *dev_path =3D virMediatedDeviceGetSysfsPath(uuidstr); - char *vfio_path =3D NULL; =20 if (!dev_path) return NULL; =20 iommu_path =3D g_strdup_printf("%s/iommu_group", dev_path); =20 if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path= ); return NULL; } =20 if (virFileResolveLink(iommu_path, &result_path) < 0) { virReportSystemError(errno, _("failed to resolve '%s'"), iommu_pat= h); return NULL; } =20 result_file =3D g_path_get_basename(result_path); =20 - vfio_path =3D g_strdup_printf("/dev/vfio/%s", result_file); - - return vfio_path; + return g_strdup_printf("/dev/vfio/%s", result_file); } =20 =20 @@ -422,10 +419,7 @@ virMediatedDeviceIsUsed(virMediatedDevicePtr dev, char * virMediatedDeviceGetSysfsPath(const char *uuidstr) { - char *ret =3D NULL; - - ret =3D g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); - return ret; + return g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); } =20 =20 diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index c537d606cc..e17f6bd1bd 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2307,19 +2307,15 @@ static char * virResctrlDeterminePath(const char *parentpath, const char *prefix, const char *id) { - char *path =3D NULL; - if (!id) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Resctrl ID must be set before determining resctr= l " "parentpath=3D'%s' prefix=3D'%s'"), parentpath, p= refix); return NULL; } =20 - path =3D g_strdup_printf("%s/%s-%s", parentpath, prefix, id); - - return path; + return g_strdup_printf("%s/%s-%s", parentpath, prefix, id); } =20 =20 diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4c9f124e88..a858a69204 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -578,35 +578,32 @@ char * virSocketAddrGetPath(virSocketAddrPtr addr G_GNUC_UNUSED) { #ifndef WIN32 - char *path =3D NULL; if (addr =3D=3D NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("No socket address provided")); return NULL; } =20 if (addr->data.sa.sa_family !=3D AF_UNIX) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("UNIX socket address is required")); return NULL; } =20 - path =3D g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_pa= th)); - - return path; + return g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_path= )); #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("UNIX sockets not supported on this platform")); return NULL; #endif } =20 =20 /** * virSocketAddrIsNetmask: * @netmask: the netmask address * * Check that @netmask is a proper network mask * * Returns 0 in case of success and -1 in case of error */ diff --git a/src/util/virutil.c b/src/util/virutil.c index 5b52e4e6d4..fb46501142 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1419,21 +1419,19 @@ char * virGetUnprivSGIOSysfsPath(const char *path, const char *sysfs_dir) { int maj, min; - char *sysfs_path =3D NULL; int rc; =20 if ((rc =3D virGetDeviceID(path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get device ID '%s'"), path); return NULL; } =20 - sysfs_path =3D g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_P= ATH, - maj, min); - return sysfs_path; + return g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, m= aj, + min); } =20 int diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4a303c0185..04febd1b0c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -185,11 +185,7 @@ fakeStorageVolGetInfo(virStorageVolPtr vol, static char * fakeStorageVolGetPath(virStorageVolPtr vol) { - char *ret =3D NULL; - - ret =3D g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); - - return ret; + return g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); } =20 =20 --=20 2.26.2