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

storage: Alter @aclfilter to just @filter

Browse Source 
Rename the variable, recent review requested just use of @filter,
so be consistent throughout.
This commit is contained in:
John Ferlan 2017-08-16 09:26:59 -04:00
parent 8ce0556fc5
commit 1910abbf47
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/virstorageobj.c
View File

@ -198,7 +198,7 @@ virStorageVolDefFindByName(virStoragePoolObjPtr obj,
int int
virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolVolumeACLFilter aclfilter) virStoragePoolVolumeACLFilter filter)
{ {
virStoragePoolDefPtr pooldef = obj->def; virStoragePoolDefPtr pooldef = obj->def;
virStorageVolDefListPtr volumes = &obj->volumes; virStorageVolDefListPtr volumes = &obj->volumes;
@ -207,7 +207,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
for (i = 0; i < volumes->count; i++) { for (i = 0; i < volumes->count; i++) {
virStorageVolDefPtr def = volumes->objs[i]; virStorageVolDefPtr def = volumes->objs[i];
if (aclfilter && !aclfilter(conn, pooldef, def)) if (filter && !filter(conn, pooldef, def))
continue; continue;
nvolumes++; nvolumes++;
} }
@ -219,7 +219,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
int int
virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolVolumeACLFilter aclfilter, virStoragePoolVolumeACLFilter filter,
char **const names, char **const names,
int maxnames) int maxnames)
{ {
@ -230,7 +230,7 @@ virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
for (i = 0; i < volumes->count && nnames < maxnames; i++) { for (i = 0; i < volumes->count && nnames < maxnames; i++) {
virStorageVolDefPtr def = volumes->objs[i]; virStorageVolDefPtr def = volumes->objs[i];
if (aclfilter && !aclfilter(conn, pooldef, def)) if (filter && !filter(conn, pooldef, def))
continue; continue;
if (VIR_STRDUP(names[nnames], def->name) < 0) if (VIR_STRDUP(names[nnames], def->name) < 0)
goto failure; goto failure;
@ -251,7 +251,7 @@ int
virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjVolumeListExport(virConnectPtr conn,
virStoragePoolObjPtr obj, virStoragePoolObjPtr obj,
virStorageVolPtr **vols, virStorageVolPtr **vols,
virStoragePoolVolumeACLFilter aclfilter) virStoragePoolVolumeACLFilter filter)
{ {
virStoragePoolDefPtr pooldef = obj->def; virStoragePoolDefPtr pooldef = obj->def;
virStorageVolDefListPtr volumes = &obj->volumes; virStorageVolDefListPtr volumes = &obj->volumes;
@ -272,7 +272,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn,
for (i = 0; i < volumes->count; i++) { for (i = 0; i < volumes->count; i++) {
virStorageVolDefPtr def = volumes->objs[i]; virStorageVolDefPtr def = volumes->objs[i];
if (aclfilter && !aclfilter(conn, pooldef, def)) if (filter && !filter(conn, pooldef, def))
continue; continue;
if (!(vol = virGetStorageVol(conn, pooldef->name, def->name, def->key, if (!(vol = virGetStorageVol(conn, pooldef->name, def->name, def->key,
NULL, NULL))) NULL, NULL)))
@ -562,7 +562,7 @@ int
virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools,
virConnectPtr conn, virConnectPtr conn,
bool wantActive, bool wantActive,
virStoragePoolObjListACLFilter aclfilter) virStoragePoolObjListACLFilter filter)
{ {
int npools = 0; int npools = 0;
size_t i; size_t i;
@ -570,7 +570,7 @@ virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools,
for (i = 0; i < pools->count; i++) { for (i = 0; i < pools->count; i++) {
virStoragePoolObjPtr obj = pools->objs[i]; virStoragePoolObjPtr obj = pools->objs[i];
virStoragePoolObjLock(obj); virStoragePoolObjLock(obj);
if (!aclfilter || aclfilter(conn, obj->def)) { if (!filter || filter(conn, obj->def)) {
if (wantActive == virStoragePoolObjIsActive(obj)) if (wantActive == virStoragePoolObjIsActive(obj))
npools++; npools++;
} }
@ -585,7 +585,7 @@ int
virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virStoragePoolObjGetNames(virStoragePoolObjListPtr pools,
virConnectPtr conn, virConnectPtr conn,
bool wantActive, bool wantActive,
virStoragePoolObjListACLFilter aclfilter, virStoragePoolObjListACLFilter filter,
char **const names, char **const names,
int maxnames) int maxnames)
{ {
@ -595,7 +595,7 @@ virStoragePoolObjGetNames(virStoragePoolObjListPtr pools,
for (i = 0; i < pools->count && nnames < maxnames; i++) { for (i = 0; i < pools->count && nnames < maxnames; i++) {
virStoragePoolObjPtr obj = pools->objs[i]; virStoragePoolObjPtr obj = pools->objs[i];
virStoragePoolObjLock(obj); virStoragePoolObjLock(obj);
if (!aclfilter || aclfilter(conn, obj->def)) { if (!filter || filter(conn, obj->def)) {
if (wantActive == virStoragePoolObjIsActive(obj)) { if (wantActive == virStoragePoolObjIsActive(obj)) {
if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { if (VIR_STRDUP(names[nnames], obj->def->name) < 0) {
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);

10
src/conf/virstorageobj.h
View File

@ -116,12 +116,12 @@ typedef bool
int int
virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolVolumeACLFilter aclfilter); virStoragePoolVolumeACLFilter filter);
int int
virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolVolumeACLFilter aclfilter, virStoragePoolVolumeACLFilter filter,
char **const names, char **const names,
int maxnames); int maxnames);
@ -129,7 +129,7 @@ int
virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjVolumeListExport(virConnectPtr conn,
virStoragePoolObjPtr obj, virStoragePoolObjPtr obj,
virStorageVolPtr **vols, virStorageVolPtr **vols,
virStoragePoolVolumeACLFilter aclfilter); virStoragePoolVolumeACLFilter filter);
virStoragePoolObjPtr virStoragePoolObjPtr
virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools,
@ -150,13 +150,13 @@ int
virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools,
virConnectPtr conn, virConnectPtr conn,
bool wantActive, bool wantActive,
virStoragePoolObjListACLFilter aclfilter); virStoragePoolObjListACLFilter filter);
int int
virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virStoragePoolObjGetNames(virStoragePoolObjListPtr pools,
virConnectPtr conn, virConnectPtr conn,
bool wantActive, bool wantActive,
virStoragePoolObjListACLFilter aclfilter, virStoragePoolObjListACLFilter filter,
char **const names, char **const names,
int maxnames); int maxnames);