NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

interface: Remove some unnecessary goto's for Interface tests

Browse Source 
Rather than using goto cleanup on object find failure and having cleanup
need to check if the obj was present before unlocking, just return immediately.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-14 09:05:21 -04:00
parent 3a18ee91b7
commit 4845df2784
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/test/test_driver.c
View File

@ -3709,13 +3709,11 @@ testInterfaceLookupByName(virConnectPtr conn,
virInterfacePtr ret = NULL; virInterfacePtr ret = NULL;
if (!(obj = testInterfaceObjFindByName(privconn, name))) if (!(obj = testInterfaceObjFindByName(privconn, name)))
goto cleanup; return NULL;
ret = virGetInterface(conn, obj->def->name, obj->def->mac); ret = virGetInterface(conn, obj->def->name, obj->def->mac);
cleanup: virInterfaceObjUnlock(obj);
if (obj)
virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3760,13 +3758,11 @@ testInterfaceIsActive(virInterfacePtr iface)
int ret = -1; int ret = -1;
if (!(obj = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; return -1;
ret = virInterfaceObjIsActive(obj); ret = virInterfaceObjIsActive(obj);
cleanup: virInterfaceObjUnlock(obj);
if (obj)
virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3875,13 +3871,11 @@ testInterfaceGetXMLDesc(virInterfacePtr iface,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (!(obj = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; return NULL;
ret = virInterfaceDefFormat(obj->def); ret = virInterfaceDefFormat(obj->def);
cleanup: virInterfaceObjUnlock(obj);
if (obj)
virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3922,16 +3916,13 @@ testInterfaceUndefine(virInterfacePtr iface)
{ {
testDriverPtr privconn = iface->conn->privateData; testDriverPtr privconn = iface->conn->privateData;
virInterfaceObjPtr obj; virInterfaceObjPtr obj;
int ret = -1;
if (!(obj = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; return -1;
virInterfaceObjRemove(&privconn->ifaces, obj); virInterfaceObjRemove(&privconn->ifaces, obj);
ret = 0;
cleanup: return 0;
return ret;
} }
@ -3946,7 +3937,7 @@ testInterfaceCreate(virInterfacePtr iface,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!(obj = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; return -1;
if (obj->active != 0) { if (obj->active != 0) {
virReportError(VIR_ERR_OPERATION_INVALID, NULL); virReportError(VIR_ERR_OPERATION_INVALID, NULL);
@ -3957,8 +3948,7 @@ testInterfaceCreate(virInterfacePtr iface,
ret = 0; ret = 0;
cleanup: cleanup:
if (obj) virInterfaceObjUnlock(obj);
virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3974,7 +3964,7 @@ testInterfaceDestroy(virInterfacePtr iface,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!(obj = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; return -1;
if (obj->active == 0) { if (obj->active == 0) {
virReportError(VIR_ERR_OPERATION_INVALID, NULL); virReportError(VIR_ERR_OPERATION_INVALID, NULL);
@ -3985,8 +3975,7 @@ testInterfaceDestroy(virInterfacePtr iface,
ret = 0; ret = 0;
cleanup: cleanup:
if (obj) virInterfaceObjUnlock(obj);
virInterfaceObjUnlock(obj);
return ret; return ret;
} }