From nobody Thu May 15 02:02:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1514913147630714.6548633131471; Tue, 2 Jan 2018 09:12:27 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 6CFBD4E33E; Tue, 2 Jan 2018 17:12:26 +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 48DBB5C543; Tue, 2 Jan 2018 17:12:26 +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 CC2C14A467; Tue, 2 Jan 2018 17:12:25 +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 w02HCOP5003058 for ; Tue, 2 Jan 2018 12:12:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 86A7E5C3F8; Tue, 2 Jan 2018 17:12:24 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-45.brq.redhat.com [10.40.204.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECC565C888 for ; Tue, 2 Jan 2018 17:12:23 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 2 Jan 2018 18:11:55 +0100 Message-Id: <04dbb8cab8fde1b9ed225362e863aeeaf9c386ba.1514911024.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/18] vsh: Drop useless check for cmd != NULL 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 02 Jan 2018 17:12:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" All our internal *Free() functions are capable of handling NULL. Signed-off-by: Michal Privoznik --- tools/vsh.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index e38dcec92..a21e1d1de 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1392,10 +1392,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *p= arser) vshCmd *clast =3D NULL; vshCmdOpt *first =3D NULL; =20 - if (ctl->cmd) { - vshCommandFree(ctl->cmd); - ctl->cmd =3D NULL; - } + vshCommandFree(ctl->cmd); + ctl->cmd =3D NULL; =20 while (1) { vshCmdOpt *last =3D NULL; @@ -1576,10 +1574,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *p= arser) return true; =20 syntaxError: - if (ctl->cmd) { - vshCommandFree(ctl->cmd); - ctl->cmd =3D NULL; - } + vshCommandFree(ctl->cmd); + ctl->cmd =3D NULL; vshCommandOptFree(first); VIR_FREE(tkdata); return false; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list