[libvirt] [PATCH] conf: Rename [n]macs and maxmacs to [n]names and maxnames
To avoid further confusion - rename the array elements to what they are.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
Pushing as trivial as noted by:
https://www.redhat.com/archives/libvir-list/2017-October/msg00981.html
src/conf/virinterfaceobj.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index 21d76e7507..f90c0bd9c4 100644
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -160,9 +160,9 @@ virInterfaceObjListNew(void)
struct _virInterfaceObjFindMACData {
const char *matchStr;
bool error;
- int nmacs;
- int maxmacs;
- char **const macs;
+ int nnames;
+ int maxnames;
+ char **const names;
};
static int
@@ -176,17 +176,17 @@ virInterfaceObjListFindByMACStringCb(void *payload,
if (data->error)
return 0;
- if (data->nmacs == data->maxmacs)
+ if (data->nnames == data->maxnames)
return 0;
virObjectLock(obj);
if (STRCASEEQ(obj->def->mac, data->matchStr)) {
- if (VIR_STRDUP(data->macs[data->nmacs], obj->def->name) < 0) {
+ if (VIR_STRDUP(data->names[data->nnames], obj->def->name) < 0) {
data->error = true;
goto cleanup;
}
- data->nmacs++;
+ data->nnames++;
}
cleanup:
@@ -203,9 +203,9 @@ virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces,
{
struct _virInterfaceObjFindMACData data = { .matchStr = mac,
.error = false,
- .nmacs = 0,
- .maxmacs = maxmatches,
- .macs = matches };
+ .nnames = 0,
+ .maxnames = maxmatches,
+ .names = matches };
virObjectRWLockRead(interfaces);
virHashForEach(interfaces->objsName, virInterfaceObjListFindByMACStringCb,
@@ -215,11 +215,11 @@ virInterfaceObjListFindByMACString(virInterfaceObjListPtr
interfaces,
if (data.error)
goto error;
- return data.nmacs;
+ return data.nnames;
error:
- while (--data.nmacs >= 0)
- VIR_FREE(data.macs[data.nmacs]);
+ while (--data.nnames >= 0)
+ VIR_FREE(data.names[data.nnames]);
return -1;
}
--
2.13.6