提交 5d5f7183 编写于 作者: J John Ferlan

nwfilter: Clean up a couple nwfilter_driver error paths

No need to goto cleanup and check "if (obj)" if we know (obj) isn't there,
so just return immediately.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 f7ecae61
......@@ -391,7 +391,7 @@ nwfilterLookupByUUID(virConnectPtr conn,
nwfilterDriverUnlock();
if (!obj)
goto cleanup;
return NULL;
def = virNWFilterObjGetDef(obj);
if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0)
......@@ -400,8 +400,7 @@ nwfilterLookupByUUID(virConnectPtr conn,
ret = virGetNWFilter(conn, def->name, def->uuid);
cleanup:
if (obj)
virNWFilterObjUnlock(obj);
virNWFilterObjUnlock(obj);
return ret;
}
......@@ -421,7 +420,7 @@ nwfilterLookupByName(virConnectPtr conn,
if (!obj) {
virReportError(VIR_ERR_NO_NWFILTER,
_("no nwfilter with matching name '%s'"), name);
goto cleanup;
return NULL;
}
def = virNWFilterObjGetDef(obj);
......@@ -431,8 +430,7 @@ nwfilterLookupByName(virConnectPtr conn,
ret = virGetNWFilter(conn, def->name, def->uuid);
cleanup:
if (obj)
virNWFilterObjUnlock(obj);
virNWFilterObjUnlock(obj);
return ret;
}
......@@ -594,7 +592,7 @@ nwfilterGetXMLDesc(virNWFilterPtr nwfilter,
nwfilterDriverUnlock();
if (!obj)
goto cleanup;
return NULL;
def = virNWFilterObjGetDef(obj);
if (virNWFilterGetXMLDescEnsureACL(nwfilter->conn, def) < 0)
......@@ -603,8 +601,7 @@ nwfilterGetXMLDesc(virNWFilterPtr nwfilter,
ret = virNWFilterDefFormat(def);
cleanup:
if (obj)
virNWFilterObjUnlock(obj);
virNWFilterObjUnlock(obj);
return ret;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册