External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Clean up a couple nwfilter_driver error paths

Browse Source 
No need to goto cleanup and check "if (obj)" if we know (obj) isn't there,
so just return immediately.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-14 08:57:13 -04:00
parent f7ecae6107
commit 5d5f718323
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nwfilter/nwfilter_driver.c
View File

@ -391,7 +391,7 @@ nwfilterLookupByUUID(virConnectPtr conn,
nwfilterDriverUnlock(); nwfilterDriverUnlock();
if (!obj) if (!obj)
goto cleanup; return NULL;
def = virNWFilterObjGetDef(obj); def = virNWFilterObjGetDef(obj);
if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0) if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0)
@ -400,8 +400,7 @@ nwfilterLookupByUUID(virConnectPtr conn,
ret = virGetNWFilter(conn, def->name, def->uuid); ret = virGetNWFilter(conn, def->name, def->uuid);
cleanup: cleanup:
if (obj) virNWFilterObjUnlock(obj);
virNWFilterObjUnlock(obj);
return ret; return ret;
} }
@ -421,7 +420,7 @@ nwfilterLookupByName(virConnectPtr conn,
if (!obj) { if (!obj) {
virReportError(VIR_ERR_NO_NWFILTER, virReportError(VIR_ERR_NO_NWFILTER,
_("no nwfilter with matching name '%s'"), name); _("no nwfilter with matching name '%s'"), name);
goto cleanup; return NULL;
} }
def = virNWFilterObjGetDef(obj); def = virNWFilterObjGetDef(obj);
@ -431,8 +430,7 @@ nwfilterLookupByName(virConnectPtr conn,
ret = virGetNWFilter(conn, def->name, def->uuid); ret = virGetNWFilter(conn, def->name, def->uuid);
cleanup: cleanup:
if (obj) virNWFilterObjUnlock(obj);
virNWFilterObjUnlock(obj);
return ret; return ret;
} }
@ -594,7 +592,7 @@ nwfilterGetXMLDesc(virNWFilterPtr nwfilter,
nwfilterDriverUnlock(); nwfilterDriverUnlock();
if (!obj) if (!obj)
goto cleanup; return NULL;
def = virNWFilterObjGetDef(obj); def = virNWFilterObjGetDef(obj);
if (virNWFilterGetXMLDescEnsureACL(nwfilter->conn, def) < 0) if (virNWFilterGetXMLDescEnsureACL(nwfilter->conn, def) < 0)
@ -603,8 +601,7 @@ nwfilterGetXMLDesc(virNWFilterPtr nwfilter,
ret = virNWFilterDefFormat(def); ret = virNWFilterDefFormat(def);
cleanup: cleanup:
if (obj) virNWFilterObjUnlock(obj);
virNWFilterObjUnlock(obj);
return ret; return ret;
} }