提交 ce003744 编写于 作者: M Michal Privoznik

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: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 69a8c64f
......@@ -2602,9 +2602,6 @@ virDomainChrSourceDefDispose(void *obj)
virDomainChrSourceDefPtr def = obj;
size_t i;
if (!def)
return;
virDomainChrSourceDefClear(def);
virObjectUnref(def->privateData);
......
......@@ -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);
......
......@@ -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);
......
......@@ -131,9 +131,6 @@ virHostdevManagerDispose(void *obj)
{
virHostdevManagerPtr hostdevMgr = obj;
if (!hostdevMgr)
return;
virObjectUnref(hostdevMgr->activePCIHostdevs);
virObjectUnref(hostdevMgr->inactivePCIHostdevs);
virObjectUnref(hostdevMgr->activeUSBHostdevs);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册