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

secret: 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:41 -04:00
parent 59310792a6
commit 8ce0556fc5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/virsecretobj.c
View File

@ -412,7 +412,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
struct virSecretCountData { struct virSecretCountData {
virConnectPtr conn; virConnectPtr conn;
virSecretObjListACLFilter aclfilter; virSecretObjListACLFilter filter;
int count; int count;
}; };
@ -428,7 +428,7 @@ virSecretObjListNumOfSecretsCallback(void *payload,
virObjectLock(obj); virObjectLock(obj);
def = obj->def; def = obj->def;
if (data->aclfilter && !data->aclfilter(data->conn, def)) if (data->filter && !data->filter(data->conn, def))
goto cleanup; goto cleanup;
data->count++; data->count++;
@ -441,7 +441,7 @@ virSecretObjListNumOfSecretsCallback(void *payload,
struct virSecretListData { struct virSecretListData {
virConnectPtr conn; virConnectPtr conn;
virSecretObjListACLFilter aclfilter; virSecretObjListACLFilter filter;
int nuuids; int nuuids;
char **uuids; char **uuids;
int maxuuids; int maxuuids;
@ -467,7 +467,7 @@ virSecretObjListGetUUIDsCallback(void *payload,
virObjectLock(obj); virObjectLock(obj);
def = obj->def; def = obj->def;
if (data->aclfilter && !data->aclfilter(data->conn, def)) if (data->filter && !data->filter(data->conn, def))
goto cleanup; goto cleanup;
if (data->uuids) { if (data->uuids) {
@ -490,11 +490,11 @@ virSecretObjListGetUUIDsCallback(void *payload,
int int
virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, virSecretObjListNumOfSecrets(virSecretObjListPtr secrets,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter filter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virSecretCountData data = { struct virSecretCountData data = {
.conn = conn, .aclfilter = aclfilter, .count = 0 }; .conn = conn, .filter = filter, .count = 0 };
virObjectLock(secrets); virObjectLock(secrets);
virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &data); virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &data);
@ -535,7 +535,7 @@ virSecretObjMatchFlags(virSecretObjPtr obj,
struct virSecretObjListData { struct virSecretObjListData {
virConnectPtr conn; virConnectPtr conn;
virSecretPtr *secrets; virSecretPtr *secrets;
virSecretObjListACLFilter aclfilter; virSecretObjListACLFilter filter;
unsigned int flags; unsigned int flags;
int nsecrets; int nsecrets;
bool error; bool error;
@ -557,7 +557,7 @@ virSecretObjListExportCallback(void *payload,
virObjectLock(obj); virObjectLock(obj);
def = obj->def; def = obj->def;
if (data->aclfilter && !data->aclfilter(data->conn, def)) if (data->filter && !data->filter(data->conn, def))
goto cleanup; goto cleanup;
if (!virSecretObjMatchFlags(obj, data->flags)) if (!virSecretObjMatchFlags(obj, data->flags))
@ -587,12 +587,12 @@ int
virSecretObjListExport(virConnectPtr conn, virSecretObjListExport(virConnectPtr conn,
virSecretObjListPtr secretobjs, virSecretObjListPtr secretobjs,
virSecretPtr **secrets, virSecretPtr **secrets,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter filter,
unsigned int flags) unsigned int flags)
{ {
struct virSecretObjListData data = { struct virSecretObjListData data = {
.conn = conn, .secrets = NULL, .conn = conn, .secrets = NULL,
.aclfilter = aclfilter, .flags = flags, .filter = filter, .flags = flags,
.nsecrets = 0, .error = false }; .nsecrets = 0, .error = false };
virObjectLock(secretobjs); virObjectLock(secretobjs);
@ -626,11 +626,11 @@ int
virSecretObjListGetUUIDs(virSecretObjListPtr secrets, virSecretObjListGetUUIDs(virSecretObjListPtr secrets,
char **uuids, char **uuids,
int maxuuids, int maxuuids,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter filter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virSecretListData data = { struct virSecretListData data = {
.conn = conn, .aclfilter = aclfilter, .uuids = uuids, .nuuids = 0, .conn = conn, .filter = filter, .uuids = uuids, .nuuids = 0,
.maxuuids = maxuuids, .error = false }; .maxuuids = maxuuids, .error = false };
virObjectLock(secrets); virObjectLock(secrets);

6
src/conf/virsecretobj.h
View File

@ -63,21 +63,21 @@ typedef bool
int int
virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, virSecretObjListNumOfSecrets(virSecretObjListPtr secrets,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter filter,
virConnectPtr conn); virConnectPtr conn);
int int
virSecretObjListExport(virConnectPtr conn, virSecretObjListExport(virConnectPtr conn,
virSecretObjListPtr secretobjs, virSecretObjListPtr secretobjs,
virSecretPtr **secrets, virSecretPtr **secrets,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter filter,
unsigned int flags); unsigned int flags);
int int
virSecretObjListGetUUIDs(virSecretObjListPtr secrets, virSecretObjListGetUUIDs(virSecretObjListPtr secrets,
char **uuids, char **uuids,
int maxuuids, int maxuuids,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter filter,
virConnectPtr conn); virConnectPtr conn);
int int