From nobody Mon Feb 9 04:45:51 2026 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=1632409816; cv=none; d=zohomail.com; s=zohoarc; b=lvY2NEgA/NQITi53o6Lk5QnyZJ7jPY3feI1c26BtzUm3QvTd+GyRruZPYkVDg1Jv6ZA3YmPcI2QBObdybg2u/JvTYeDeGK/RefOXZa/Typ04ZhXKEvuBPZKFQkBDTic2hFDLhPHcFvF8K1nn1i6hs7NHUEbCKbGqVvegdJE/p+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632409816; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VYvKuuE+jGC00A2BZzZS+YAVkUmPW97sgHnXjxcVDiY=; b=aW2c+TzGhUQpBTRlYKqsWjvI9lk3vx/sitfNU829uPmBHt7wN+Nn7ZlEVx/zo7j9gicFTZDeRdGRo5yZ3GCsImYNv7sDC8nJ1tYnHeC5/KhcBiMKiewJxZIC+IgTFMHmvJY8EPqA7P2xFMpI16g0t4eb3tmwDWi2ih4Ir+7vz48= 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 1632409816149593.1311589280368; Thu, 23 Sep 2021 08:10:16 -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-346-DfJhpoQ3Ne6kpExZSSaUpw-1; Thu, 23 Sep 2021 11:08:50 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C1D2802CBD; Thu, 23 Sep 2021 15:08:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C053F60622; Thu, 23 Sep 2021 15:08:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8F5C74EA30; Thu, 23 Sep 2021 15:08:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18NF8S3T030611 for ; Thu, 23 Sep 2021 11:08:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id E26DE171FF; Thu, 23 Sep 2021 15:08:28 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B5925FC25 for ; Thu, 23 Sep 2021 15:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632409814; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VYvKuuE+jGC00A2BZzZS+YAVkUmPW97sgHnXjxcVDiY=; b=OEA1uGgmj84fBYLoVPL1FVnjEIsZ8RBqYAIulMXYBc47o81KQPCn8cTTDrgXgwYLqsp4tE lkTAqms6GLhpV83Cl8WPnESac6dgHTeve4SLm8DIilpgNte/dHhKLyMwKGfPJrTIXVeezk OxtWQlYjkZn+R43aYfsyFUIv/OAqEHk= X-MC-Unique: DfJhpoQ3Ne6kpExZSSaUpw-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 5/5] virsh: refactor functions to not use 'ret' variable Date: Thu, 23 Sep 2021 17:08:04 +0200 Message-Id: <1e957c4b72cfef56e62eac56441631bb5a34a5bb.1632409613.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 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: 1632409817052100001 Content-Type: text/plain; charset="utf-8" This patch targets smaller functions and rewrites them into the pattern using an early return without needing redundant 'ret' variable (if possible). Patch also includes removal of 'else' branch after 'return' and other small alterations. Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- tools/virsh-host.c | 26 ++++++----------- tools/virsh-interface.c | 65 ++++++++++++++++++----------------------- tools/virsh-network.c | 47 +++++++++++++---------------- tools/virsh-nodedev.c | 32 ++++++++------------ tools/virsh-nwfilter.c | 15 +++++----- tools/virsh-util.c | 3 +- 6 files changed, 77 insertions(+), 111 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 591746655b..66cd844263 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1243,7 +1243,6 @@ static bool cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) { const char *from =3D NULL; - bool ret =3D false; g_autofree char *result =3D NULL; g_auto(GStrv) list =3D NULL; unsigned int flags =3D 0; @@ -1260,16 +1259,13 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (!(list =3D vshExtractCPUDefXMLs(ctl, from))) return false; =20 - result =3D virConnectBaselineCPU(priv->conn, (const char **)list, - g_strv_length(list), - flags); - - if (result) { - vshPrint(ctl, "%s", result); - ret =3D true; - } + if (!(result =3D virConnectBaselineCPU(priv->conn, (const char **)list, + g_strv_length(list), + flags))) + return false; =20 - return ret; + vshPrint(ctl, "%s", result); + return true; } =20 /* @@ -1355,7 +1351,6 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_= UNUSED) unsigned long includeVersion; unsigned long apiVersion; unsigned long daemonVersion; - int ret; unsigned int major; unsigned int minor; unsigned int rel; @@ -1375,8 +1370,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_= UNUSED) vshPrint(ctl, _("Compiled against library: libvirt %d.%d.%d\n"), major, minor, rel); =20 - ret =3D virGetVersion(&libVersion, hvType, &apiVersion); - if (ret < 0) { + if (virGetVersion(&libVersion, hvType, &apiVersion) < 0) { vshError(ctl, "%s", _("failed to get the library version")); return false; } @@ -1394,8 +1388,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_= UNUSED) vshPrint(ctl, _("Using API: %s %d.%d.%d\n"), hvType, major, minor, rel); =20 - ret =3D virConnectGetVersion(priv->conn, &hvVersion); - if (ret < 0) { + if (virConnectGetVersion(priv->conn, &hvVersion) < 0) { vshError(ctl, "%s", _("failed to get the hypervisor version")); return false; } @@ -1413,8 +1406,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_= UNUSED) } =20 if (vshCommandOptBool(cmd, "daemon")) { - ret =3D virConnectGetLibVersion(priv->conn, &daemonVersion); - if (ret < 0) { + if (virConnectGetLibVersion(priv->conn, &daemonVersion) < 0) { vshError(ctl, "%s", _("failed to get the daemon version")); } else { major =3D daemonVersion / 1000000; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 46af45c97b..f402119b68 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -485,26 +485,23 @@ static bool cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; - bool ret =3D true; g_autofree char *dump =3D NULL; unsigned int flags =3D 0; - bool inactive =3D vshCommandOptBool(cmd, "inactive"); =20 - if (inactive) + if (vshCommandOptBool(cmd, "inactive")) flags |=3D VIR_INTERFACE_XML_INACTIVE; =20 if (!(iface =3D virshCommandOptInterface(ctl, cmd, NULL))) return false; =20 - dump =3D virInterfaceGetXMLDesc(iface, flags); - if (dump !=3D NULL) { - vshPrint(ctl, "%s", dump); - } else { - ret =3D false; + if (!(dump =3D virInterfaceGetXMLDesc(iface, flags))) { + virInterfaceFree(iface); + return false; } =20 + vshPrint(ctl, "%s", dump); virInterfaceFree(iface); - return ret; + return true; } =20 /* @@ -535,7 +532,6 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; const char *from =3D NULL; - bool ret =3D true; g_autofree char *buffer =3D NULL; unsigned int flags =3D 0; virshControl *priv =3D ctl->privData; @@ -549,17 +545,15 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; =20 - iface =3D virInterfaceDefineXML(priv->conn, buffer, flags); - - if (iface !=3D NULL) { - vshPrintExtra(ctl, _("Interface %s defined from %s\n"), - virInterfaceGetName(iface), from); - virInterfaceFree(iface); - } else { + if (!(iface =3D virInterfaceDefineXML(priv->conn, buffer, flags))) { vshError(ctl, _("Failed to define interface from %s"), from); - ret =3D false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Interface %s defined from %s\n"), + virInterfaceGetName(iface), from); + virInterfaceFree(iface); + return true; } =20 /* @@ -584,21 +578,20 @@ static bool cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; - bool ret =3D true; const char *name; =20 if (!(iface =3D virshCommandOptInterface(ctl, cmd, &name))) return false; =20 - if (virInterfaceUndefine(iface) =3D=3D 0) { - vshPrintExtra(ctl, _("Interface %s undefined\n"), name); - } else { + if (virInterfaceUndefine(iface) < 0) { vshError(ctl, _("Failed to undefine interface %s"), name); - ret =3D false; + virInterfaceFree(iface); + return false; } =20 + vshPrintExtra(ctl, _("Interface %s undefined\n"), name); virInterfaceFree(iface); - return ret; + return true; } =20 /* @@ -623,21 +616,20 @@ static bool cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; - bool ret =3D true; const char *name; =20 if (!(iface =3D virshCommandOptInterface(ctl, cmd, &name))) return false; =20 - if (virInterfaceCreate(iface, 0) =3D=3D 0) { - vshPrintExtra(ctl, _("Interface %s started\n"), name); - } else { + if (virInterfaceCreate(iface, 0) < 0) { vshError(ctl, _("Failed to start interface %s"), name); - ret =3D false; + virInterfaceFree(iface); + return false; } =20 + vshPrintExtra(ctl, _("Interface %s started\n"), name); virInterfaceFree(iface); - return ret; + return true; } =20 /* @@ -662,21 +654,20 @@ static bool cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; - bool ret =3D true; const char *name; =20 if (!(iface =3D virshCommandOptInterface(ctl, cmd, &name))) return false; =20 - if (virInterfaceDestroy(iface, 0) =3D=3D 0) { - vshPrintExtra(ctl, _("Interface %s destroyed\n"), name); - } else { + if (virInterfaceDestroy(iface, 0) < 0) { vshError(ctl, _("Failed to destroy interface %s"), name); - ret =3D false; + virInterfaceFree(iface); + return false; } =20 + vshPrintExtra(ctl, _("Interface %s destroyed\n"), name); virInterfaceFree(iface); - return ret; + return false; } =20 /* diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 8651265909..1442210278 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -209,7 +209,6 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; const char *from =3D NULL; - bool ret =3D true; g_autofree char *buffer =3D NULL; unsigned int flags =3D 0; virshControl *priv =3D ctl->privData; @@ -228,15 +227,15 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) else network =3D virNetworkCreateXML(priv->conn, buffer); =20 - if (network !=3D NULL) { - vshPrintExtra(ctl, _("Network %s created from %s\n"), - virNetworkGetName(network), from); - virNetworkFree(network); - } else { + if (!network) { vshError(ctl, _("Failed to create network from %s"), from); - ret =3D false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Network %s created from %s\n"), + virNetworkGetName(network), from); + virNetworkFree(network); + return true; } =20 /* @@ -267,7 +266,6 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; const char *from =3D NULL; - bool ret =3D true; g_autofree char *buffer =3D NULL; unsigned int flags =3D 0; virshControl *priv =3D ctl->privData; @@ -286,15 +284,15 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) else network =3D virNetworkDefineXML(priv->conn, buffer); =20 - if (network !=3D NULL) { - vshPrintExtra(ctl, _("Network %s defined from %s\n"), - virNetworkGetName(network), from); - virNetworkFree(network); - } else { + if (!network) { vshError(ctl, _("Failed to define network from %s"), from); - ret =3D false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Network %s defined from %s\n"), + virNetworkGetName(network), from); + virNetworkFree(network); + return true; } =20 /* @@ -362,28 +360,23 @@ static bool cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; - bool ret =3D true; g_autofree char *dump =3D NULL; unsigned int flags =3D 0; - int inactive; =20 if (!(network =3D virshCommandOptNetwork(ctl, cmd, NULL))) return false; =20 - inactive =3D vshCommandOptBool(cmd, "inactive"); - if (inactive) + if (vshCommandOptBool(cmd, "inactive")) flags |=3D VIR_NETWORK_XML_INACTIVE; =20 - dump =3D virNetworkGetXMLDesc(network, flags); - - if (dump !=3D NULL) { - vshPrint(ctl, "%s", dump); - } else { - ret =3D false; + if (!(dump =3D virNetworkGetXMLDesc(network, flags))) { + virNetworkFree(network); + return false; } =20 + vshPrint(ctl, "%s", dump); virNetworkFree(network); - return ret; + return true; } =20 /* diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index f1b4eb94bf..f72359121f 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -57,7 +57,6 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) { virNodeDevicePtr dev =3D NULL; const char *from =3D NULL; - bool ret =3D true; g_autofree char *buffer =3D NULL; virshControl *priv =3D ctl->privData; =20 @@ -67,18 +66,15 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; =20 - dev =3D virNodeDeviceCreateXML(priv->conn, buffer, 0); - - if (dev !=3D NULL) { - vshPrintExtra(ctl, _("Node device %s created from %s\n"), - virNodeDeviceGetName(dev), from); - virNodeDeviceFree(dev); - } else { + if (!(dev =3D virNodeDeviceCreateXML(priv->conn, buffer, 0))) { vshError(ctl, _("Failed to create node device from %s"), from); - ret =3D false; + return false; } =20 - return ret; + vshPrintExtra(ctl, _("Node device %s created from %s\n"), + virNodeDeviceGetName(dev), from); + virNodeDeviceFree(dev); + return true; } =20 =20 @@ -1077,7 +1073,6 @@ cmdNodeDeviceDefine(vshControl *ctl, const vshCmd *cm= d G_GNUC_UNUSED) { virNodeDevice *dev =3D NULL; const char *from =3D NULL; - bool ret =3D true; g_autofree char *buffer =3D NULL; virshControl *priv =3D ctl->privData; =20 @@ -1087,18 +1082,15 @@ cmdNodeDeviceDefine(vshControl *ctl, const vshCmd *= cmd G_GNUC_UNUSED) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; =20 - dev =3D virNodeDeviceDefineXML(priv->conn, buffer, 0); - - if (dev !=3D NULL) { - vshPrintExtra(ctl, _("Node device '%s' defined from '%s'\n"), - virNodeDeviceGetName(dev), from); - virNodeDeviceFree(dev); - } else { + if (!(dev =3D virNodeDeviceDefineXML(priv->conn, buffer, 0))) { vshError(ctl, _("Failed to define node device from '%s'"), from); - ret =3D false; + return false; } =20 - return ret; + vshPrintExtra(ctl, _("Node device '%s' defined from '%s'\n"), + virNodeDeviceGetName(dev), from); + virNodeDeviceFree(dev); + return true; } =20 =20 diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 77f211d031..33164f623f 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -515,7 +515,6 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCmd = *cmd) { virNWFilterBindingPtr binding; const char *from =3D NULL; - bool ret =3D true; char *buffer; unsigned int flags =3D 0; virshControl *priv =3D ctl->privData; @@ -532,15 +531,15 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCm= d *cmd) binding =3D virNWFilterBindingCreateXML(priv->conn, buffer, flags); VIR_FREE(buffer); =20 - if (binding !=3D NULL) { - vshPrintExtra(ctl, _("Network filter binding on %s created from %s= \n"), - virNWFilterBindingGetPortDev(binding), from); - virNWFilterBindingFree(binding); - } else { + if (!binding) { vshError(ctl, _("Failed to create network filter from %s"), from); - ret =3D false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Network filter binding on %s created from %s\n"), + virNWFilterBindingGetPortDev(binding), from); + virNWFilterBindingFree(binding); + return true; } =20 =20 diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 19cd0bcb99..fb74514b3c 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -137,8 +137,7 @@ virshDomainState(vshControl *ctl, /* fall back to virDomainGetInfo if virDomainGetState is not supported= */ if (virDomainGetInfo(dom, &info) < 0) return -1; - else - return info.state; + return info.state; } =20 =20 --=20 2.31.1