misc: Drop useless checks from *Dispose() functions

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 <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a3a514136b58458f290e9a4c3813b83bb800bb07..732d37329f7264a7b03e41430963aec8cc74da06 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2602,9 +2602,6 @@ virDomainChrSourceDefDispose(void *obj)
     virDomainChrSourceDefPtr def = obj;
     size_t i;
 
-    if (!def)
-        return;
-
     virDomainChrSourceDefClear(def);
     virObjectUnref(def->privateData);
 

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index cdd9863eb80339fb15dd6a1d4701413bbaa528f6..31b5af8e9e09b79e8ab3473461de946cd1b32ae5 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -156,9 +156,6 @@ virStorageVolObjDispose(void *opaque)
 {
     virStorageVolObjPtr obj = opaque;
 
-    if (!obj)
-        return;
-
     virStorageVolDefFree(obj->voldef);
 }
 
@@ -190,9 +187,6 @@ virStorageVolObjListDispose(void *opaque)
 {
     virStorageVolObjListPtr vols = opaque;
 
-    if (!vols)
-        return;
-
     virHashFree(vols->objsKey);
     virHashFree(vols->objsName);
     virHashFree(vols->objsPath);
@@ -362,9 +356,6 @@ virStoragePoolObjDispose(void *opaque)
 {
     virStoragePoolObjPtr obj = opaque;
 
-    if (!obj)
-        return;
-
     virStoragePoolObjClearVols(obj);
     virObjectUnref(obj->volumes);
 

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 324b35b6750e6009f0dfe6709bcc19348ce42730..04b720014d587c90885596a4e2a71067d31c2d6c 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -135,9 +135,6 @@ virNetSSHSessionDispose(void *obj)
     virNetSSHSessionPtr sess = obj;
     VIR_DEBUG("sess=0x%p", sess);
 
-    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 19ae001971f78b834cef30e83d5c8d0563d007d2..fe176f35e4194752c7f02573f17ed132985a2b2e 100644 (file)
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -131,9 +131,6 @@ virHostdevManagerDispose(void *obj)
 {
     virHostdevManagerPtr hostdevMgr = obj;
 
-    if (!hostdevMgr)
-        return;
-
     virObjectUnref(hostdevMgr->activePCIHostdevs);
     virObjectUnref(hostdevMgr->inactivePCIHostdevs);
     virObjectUnref(hostdevMgr->activeUSBHostdevs);