External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Change 'index' to 'idx'

Browse Source 
Forthcoming syntax check rule will disallow usage of 'int index', so
change it for nwfilter
This commit is contained in:
John Ferlan 2015-04-14 07:36:23 -04:00
parent 29359e99bf
commit ba7e88edf7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/nwfilter_params.c
View File

@ -931,7 +931,7 @@ virNWFilterVarAccessEqual(const virNWFilterVarAccess *a,
switch (a->accessType) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
return (a->u.index.index == b->u.index.index &&
return (a->u.index.idx == b->u.index.idx &&
a->u.index.intIterId == b->u.index.intIterId);
break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
@ -1010,7 +1010,7 @@ virNWFilterVarAccessParse(const char *varAccess)
switch (dest->accessType) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
dest->u.index.index = result;
dest->u.index.idx = result;
dest->u.index.intIterId = ~0;
break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
@ -1044,7 +1044,7 @@ virNWFilterVarAccessPrint(virNWFilterVarAccessPtr vap, virBufferPtr buf)
virBufferAdd(buf, vap->varName, -1);
switch (vap->accessType) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
virBufferAsprintf(buf, "[%u]", vap->u.index.index);
virBufferAsprintf(buf, "[%u]", vap->u.index.idx);
break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
if (vap->u.iterId != 0)
@ -1076,7 +1076,7 @@ virNWFilterVarAccessGetIterId(const virNWFilterVarAccess *vap)
unsigned int
virNWFilterVarAccessGetIndex(const virNWFilterVarAccess *vap)
{
return vap->u.index.index;
return vap->u.index.idx;
}
static void

2
src/conf/nwfilter_params.h
View File

@ -111,7 +111,7 @@ struct _virNWFilterVarAccess {
virNWFilterVarAccessType accessType;
union {
struct {
unsigned int index;
unsigned int idx;
unsigned int intIterId;
} index;
unsigned int iterId;