From 5d5f718323c217b0895de5a23c07770365a2462c Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Sun, 14 May 2017 08:57:13 -0400 Subject: [PATCH] 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: John Ferlan --- src/nwfilter/nwfilter_driver.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 5e620234ec..59d01b452c 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -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; } -- GitLab