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: Consistently use 'obj' for a virInterfaceObjPtr

Browse Source 
Alter variable names to be obj rather than 'iface' and/or 'obj'.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-18 22:29:44 -04:00
parent ed914284ba
commit 3a18ee91b7
3 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/conf/virinterfaceobj.c
View File

@ -51,14 +51,14 @@ virInterfaceObjUnlock(virInterfaceObjPtr obj)
void void
virInterfaceObjFree(virInterfaceObjPtr iface) virInterfaceObjFree(virInterfaceObjPtr obj)
{ {
if (!iface) if (!obj)
return; return;
virInterfaceDefFree(iface->def); virInterfaceDefFree(obj->def);
virMutexDestroy(&iface->lock); virMutexDestroy(&obj->lock);
VIR_FREE(iface); VIR_FREE(obj);
} }
@ -136,7 +136,7 @@ virInterfaceObjListClone(virInterfaceObjListPtr src,
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
virInterfaceDefPtr def = src->objs[i]->def; virInterfaceDefPtr def = src->objs[i]->def;
virInterfaceDefPtr backup; virInterfaceDefPtr backup;
virInterfaceObjPtr iface; virInterfaceObjPtr obj;
char *xml = virInterfaceDefFormat(def); char *xml = virInterfaceDefFormat(def);
if (!xml) if (!xml)
@ -148,9 +148,9 @@ virInterfaceObjListClone(virInterfaceObjListPtr src,
} }
VIR_FREE(xml); VIR_FREE(xml);
if ((iface = virInterfaceObjAssignDef(dest, backup)) == NULL) if ((obj = virInterfaceObjAssignDef(dest, backup)) == NULL)
goto cleanup; goto cleanup;
virInterfaceObjUnlock(iface); /* locked by virInterfaceObjAssignDef */ virInterfaceObjUnlock(obj); /* locked by virInterfaceObjAssignDef */
} }
ret = cnt; ret = cnt;
@ -165,47 +165,47 @@ virInterfaceObjPtr
virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces, virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces,
virInterfaceDefPtr def) virInterfaceDefPtr def)
{ {
virInterfaceObjPtr iface; virInterfaceObjPtr obj;
if ((iface = virInterfaceObjFindByName(interfaces, def->name))) { if ((obj = virInterfaceObjFindByName(interfaces, def->name))) {
virInterfaceDefFree(iface->def); virInterfaceDefFree(obj->def);
iface->def = def; obj->def = def;
return iface; return obj;
} }
if (VIR_ALLOC(iface) < 0) if (VIR_ALLOC(obj) < 0)
return NULL; return NULL;
if (virMutexInit(&iface->lock) < 0) { if (virMutexInit(&obj->lock) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot initialize mutex")); "%s", _("cannot initialize mutex"));
VIR_FREE(iface); VIR_FREE(obj);
return NULL; return NULL;
} }
virInterfaceObjLock(iface); virInterfaceObjLock(obj);
if (VIR_APPEND_ELEMENT_COPY(interfaces->objs, if (VIR_APPEND_ELEMENT_COPY(interfaces->objs,
interfaces->count, iface) < 0) { interfaces->count, obj) < 0) {
virInterfaceObjFree(iface); virInterfaceObjFree(obj);
return NULL; return NULL;
} }
iface->def = def; obj->def = def;
return iface; return obj;
} }
void void
virInterfaceObjRemove(virInterfaceObjListPtr interfaces, virInterfaceObjRemove(virInterfaceObjListPtr interfaces,
virInterfaceObjPtr iface) virInterfaceObjPtr obj)
{ {
size_t i; size_t i;
virInterfaceObjUnlock(iface); virInterfaceObjUnlock(obj);
for (i = 0; i < interfaces->count; i++) { for (i = 0; i < interfaces->count; i++) {
virInterfaceObjLock(interfaces->objs[i]); virInterfaceObjLock(interfaces->objs[i]);
if (interfaces->objs[i] == iface) { if (interfaces->objs[i] == obj) {
virInterfaceObjUnlock(interfaces->objs[i]); virInterfaceObjUnlock(interfaces->objs[i]);
virInterfaceObjFree(interfaces->objs[i]); virInterfaceObjFree(interfaces->objs[i]);

4
src/conf/virinterfaceobj.h
View File

@ -54,7 +54,7 @@ virInterfaceObjFindByName(virInterfaceObjListPtr interfaces,
const char *name); const char *name);
void void
virInterfaceObjFree(virInterfaceObjPtr iface); virInterfaceObjFree(virInterfaceObjPtr obj);
void void
virInterfaceObjListFree(virInterfaceObjListPtr vms); virInterfaceObjListFree(virInterfaceObjListPtr vms);
@ -69,7 +69,7 @@ virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces,
void void
virInterfaceObjRemove(virInterfaceObjListPtr interfaces, virInterfaceObjRemove(virInterfaceObjListPtr interfaces,
virInterfaceObjPtr iface); virInterfaceObjPtr obj);
void void
virInterfaceObjLock(virInterfaceObjPtr obj); virInterfaceObjLock(virInterfaceObjPtr obj);

78
src/test/test_driver.c
View File

@ -3627,18 +3627,18 @@ static virInterfaceObjPtr
testInterfaceObjFindByName(testDriverPtr privconn, testInterfaceObjFindByName(testDriverPtr privconn,
const char *name) const char *name)
{ {
virInterfaceObjPtr iface; virInterfaceObjPtr obj;
testDriverLock(privconn); testDriverLock(privconn);
iface = virInterfaceObjFindByName(&privconn->ifaces, name); obj = virInterfaceObjFindByName(&privconn->ifaces, name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (!iface) if (!obj)
virReportError(VIR_ERR_NO_INTERFACE, virReportError(VIR_ERR_NO_INTERFACE,
_("no interface with matching name '%s'"), _("no interface with matching name '%s'"),
name); name);
return iface; return obj;
} }
@ -3705,17 +3705,17 @@ testInterfaceLookupByName(virConnectPtr conn,
const char *name) const char *name)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virInterfaceObjPtr iface; virInterfaceObjPtr obj;
virInterfacePtr ret = NULL; virInterfacePtr ret = NULL;
if (!(iface = testInterfaceObjFindByName(privconn, name))) if (!(obj = testInterfaceObjFindByName(privconn, name)))
goto cleanup; goto cleanup;
ret = virGetInterface(conn, iface->def->name, iface->def->mac); ret = virGetInterface(conn, obj->def->name, obj->def->mac);
cleanup: cleanup:
if (iface) if (obj)
virInterfaceObjUnlock(iface); virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3725,12 +3725,12 @@ testInterfaceLookupByMACString(virConnectPtr conn,
const char *mac) const char *mac)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virInterfaceObjPtr iface; virInterfaceObjPtr obj;
int ifacect; int ifacect;
virInterfacePtr ret = NULL; virInterfacePtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
ifacect = virInterfaceObjFindByMACString(&privconn->ifaces, mac, &iface, 1); ifacect = virInterfaceObjFindByMACString(&privconn->ifaces, mac, &obj, 1);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (ifacect == 0) { if (ifacect == 0) {
@ -3743,11 +3743,11 @@ testInterfaceLookupByMACString(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
ret = virGetInterface(conn, iface->def->name, iface->def->mac); ret = virGetInterface(conn, obj->def->name, obj->def->mac);
cleanup: cleanup:
if (iface) if (obj)
virInterfaceObjUnlock(iface); virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3869,19 +3869,19 @@ testInterfaceGetXMLDesc(virInterfacePtr iface,
unsigned int flags) unsigned int flags)
{ {
testDriverPtr privconn = iface->conn->privateData; testDriverPtr privconn = iface->conn->privateData;
virInterfaceObjPtr privinterface; virInterfaceObjPtr obj;
char *ret = NULL; char *ret = NULL;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (!(privinterface = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; goto cleanup;
ret = virInterfaceDefFormat(privinterface->def); ret = virInterfaceDefFormat(obj->def);
cleanup: cleanup:
if (privinterface) if (obj)
virInterfaceObjUnlock(privinterface); virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3893,7 +3893,7 @@ testInterfaceDefineXML(virConnectPtr conn,
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virInterfaceDefPtr def; virInterfaceDefPtr def;
virInterfaceObjPtr iface = NULL; virInterfaceObjPtr obj = NULL;
virInterfacePtr ret = NULL; virInterfacePtr ret = NULL;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
@ -3902,16 +3902,16 @@ testInterfaceDefineXML(virConnectPtr conn,
if ((def = virInterfaceDefParseString(xmlStr)) == NULL) if ((def = virInterfaceDefParseString(xmlStr)) == NULL)
goto cleanup; goto cleanup;
if ((iface = virInterfaceObjAssignDef(&privconn->ifaces, def)) == NULL) if ((obj = virInterfaceObjAssignDef(&privconn->ifaces, def)) == NULL)
goto cleanup; goto cleanup;
def = NULL; def = NULL;
ret = virGetInterface(conn, iface->def->name, iface->def->mac); ret = virGetInterface(conn, obj->def->name, obj->def->mac);
cleanup: cleanup:
virInterfaceDefFree(def); virInterfaceDefFree(def);
if (iface) if (obj)
virInterfaceObjUnlock(iface); virInterfaceObjUnlock(obj);
testDriverUnlock(privconn); testDriverUnlock(privconn);
return ret; return ret;
} }
@ -3921,13 +3921,13 @@ static int
testInterfaceUndefine(virInterfacePtr iface) testInterfaceUndefine(virInterfacePtr iface)
{ {
testDriverPtr privconn = iface->conn->privateData; testDriverPtr privconn = iface->conn->privateData;
virInterfaceObjPtr privinterface; virInterfaceObjPtr obj;
int ret = -1; int ret = -1;
if (!(privinterface = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; goto cleanup;
virInterfaceObjRemove(&privconn->ifaces, privinterface); virInterfaceObjRemove(&privconn->ifaces, obj);
ret = 0; ret = 0;
cleanup: cleanup:
@ -3940,25 +3940,25 @@ testInterfaceCreate(virInterfacePtr iface,
unsigned int flags) unsigned int flags)
{ {
testDriverPtr privconn = iface->conn->privateData; testDriverPtr privconn = iface->conn->privateData;
virInterfaceObjPtr privinterface; virInterfaceObjPtr obj;
int ret = -1; int ret = -1;
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!(privinterface = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; goto cleanup;
if (privinterface->active != 0) { if (obj->active != 0) {
virReportError(VIR_ERR_OPERATION_INVALID, NULL); virReportError(VIR_ERR_OPERATION_INVALID, NULL);
goto cleanup; goto cleanup;
} }
privinterface->active = 1; obj->active = 1;
ret = 0; ret = 0;
cleanup: cleanup:
if (privinterface) if (obj)
virInterfaceObjUnlock(privinterface); virInterfaceObjUnlock(obj);
return ret; return ret;
} }
@ -3968,25 +3968,25 @@ testInterfaceDestroy(virInterfacePtr iface,
unsigned int flags) unsigned int flags)
{ {
testDriverPtr privconn = iface->conn->privateData; testDriverPtr privconn = iface->conn->privateData;
virInterfaceObjPtr privinterface; virInterfaceObjPtr obj;
int ret = -1; int ret = -1;
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!(privinterface = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
goto cleanup; goto cleanup;
if (privinterface->active == 0) { if (obj->active == 0) {
virReportError(VIR_ERR_OPERATION_INVALID, NULL); virReportError(VIR_ERR_OPERATION_INVALID, NULL);
goto cleanup; goto cleanup;
} }
privinterface->active = 0; obj->active = 0;
ret = 0; ret = 0;
cleanup: cleanup:
if (privinterface) if (obj)
virInterfaceObjUnlock(privinterface); virInterfaceObjUnlock(obj);
return ret; return ret;
} }