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

6
src/conf/virsecretobj.h
View File

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