From nobody Wed May 1 23:28:22 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558606600; cv=none; d=zoho.com; s=zohoarc; b=WbiPE1XUKrZyMAeVb4zZ44bz/fJFVHyncnTQRgkbD7u+UK6kYCqodOgfMxUdbiSKcPOT4ls3FXN/2XVh6Y6xMFB95aOgOte5BSBN8e/YsJN0Q7yyFDa8rSPqWNdKFCZTwHxd0Vl8W0+2dLhSjosxQOe+qCcgu47wWlOljLuqz04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558606600; 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:ARC-Authentication-Results; bh=CbUqMlNgy6ougdX1AdU9hvK0DkACZhf3aZgLvadhNy4=; b=Inr9dyXvV/pwgGHC9Y8HMSLgSdb1701CXjujMdbHCpe59xqkWi8/x02Wuc2eVxC003gz1NV4pDrVq4D+kYThQxPp9kV4dggZo+EAbvwY6jyrXZHWVNgvnAXXBIS+/OFgxD3PNAxiIriABH5Tsq4H7pIwxcIIaOEvKzTCQJPhXe8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1558606600525464.11028055032295; Thu, 23 May 2019 03:16:40 -0700 (PDT) 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 DB1238110C; Thu, 23 May 2019 10:16:24 +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 E09355C69A; Thu, 23 May 2019 10:16: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 AC6C93D87; Thu, 23 May 2019 10:16:11 +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 x4NAGAMY006083 for ; Thu, 23 May 2019 06:16:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1B0CB67E64; Thu, 23 May 2019 10:16:10 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9333069183 for ; Thu, 23 May 2019 10:16:05 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 23 May 2019 12:16:02 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] misc: Drop useless checks from *Dispose() functions 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: , 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.28]); Thu, 23 May 2019 10:16:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Due to the way that our virObjectUnref() is written it's not possible that a NULL is passed into *Dispose() function. However, some functions check for that regardless. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/domain_conf.c | 3 --- src/conf/virstorageobj.c | 9 --------- src/rpc/virnetsshsession.c | 3 --- src/util/virhostdev.c | 3 --- 4 files changed, 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a3a514136b..732d37329f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2602,9 +2602,6 @@ virDomainChrSourceDefDispose(void *obj) virDomainChrSourceDefPtr def =3D obj; size_t i; =20 - if (!def) - return; - virDomainChrSourceDefClear(def); virObjectUnref(def->privateData); =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index cdd9863eb8..31b5af8e9e 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -156,9 +156,6 @@ virStorageVolObjDispose(void *opaque) { virStorageVolObjPtr obj =3D opaque; =20 - if (!obj) - return; - virStorageVolDefFree(obj->voldef); } =20 @@ -190,9 +187,6 @@ virStorageVolObjListDispose(void *opaque) { virStorageVolObjListPtr vols =3D opaque; =20 - if (!vols) - return; - virHashFree(vols->objsKey); virHashFree(vols->objsName); virHashFree(vols->objsPath); @@ -362,9 +356,6 @@ virStoragePoolObjDispose(void *opaque) { virStoragePoolObjPtr obj =3D opaque; =20 - if (!obj) - return; - virStoragePoolObjClearVols(obj); virObjectUnref(obj->volumes); =20 diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 324b35b675..04b720014d 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -135,9 +135,6 @@ virNetSSHSessionDispose(void *obj) virNetSSHSessionPtr sess =3D obj; VIR_DEBUG("sess=3D0x%p", sess); =20 - if (!sess) - return; - if (sess->channel) { libssh2_channel_send_eof(sess->channel); libssh2_channel_close(sess->channel); diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 19ae001971..fe176f35e4 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -131,9 +131,6 @@ virHostdevManagerDispose(void *obj) { virHostdevManagerPtr hostdevMgr =3D obj; =20 - if (!hostdevMgr) - return; - virObjectUnref(hostdevMgr->activePCIHostdevs); virObjectUnref(hostdevMgr->inactivePCIHostdevs); virObjectUnref(hostdevMgr->activeUSBHostdevs); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list