shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 03:21:44 +03:00
Code Releases Activity

secret: Rename 'filter' to 'aclfilter'

Browse Source 
Makes it a bit more clear what it is.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-25 11:22:09 -04:00
parent 4a24498c4a
commit 05f3a91196
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/virsecretobj.c
View File

@ -435,7 +435,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
struct virSecretObjListGetHelperData { struct virSecretObjListGetHelperData {
virConnectPtr conn; virConnectPtr conn;
virSecretObjListACLFilter filter; virSecretObjListACLFilter aclfilter;
int nuuids; int nuuids;
char **uuids; char **uuids;
int maxuuids; int maxuuids;
@ -461,7 +461,7 @@ virSecretObjListGetHelper(void *payload,
virObjectLock(obj); virObjectLock(obj);
def = obj->def; def = obj->def;
if (data->filter && !data->filter(data->conn, def)) if (data->aclfilter && !data->aclfilter(data->conn, def))
goto cleanup; goto cleanup;
if (data->uuids) { if (data->uuids) {
@ -486,11 +486,11 @@ virSecretObjListGetHelper(void *payload,
int int
virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, virSecretObjListNumOfSecrets(virSecretObjListPtr secrets,
virSecretObjListACLFilter filter, virSecretObjListACLFilter aclfilter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virSecretObjListGetHelperData data = { struct virSecretObjListGetHelperData data = {
.conn = conn, .filter = filter, .nuuids = 0, .conn = conn, .aclfilter = aclfilter, .nuuids = 0,
.uuids = NULL, .maxuuids = -1, .error = false }; .uuids = NULL, .maxuuids = -1, .error = false };
virObjectLock(secrets); virObjectLock(secrets);
@ -532,7 +532,7 @@ virSecretObjMatchFlags(virSecretObjPtr obj,
struct virSecretObjListData { struct virSecretObjListData {
virConnectPtr conn; virConnectPtr conn;
virSecretPtr *secrets; virSecretPtr *secrets;
virSecretObjListACLFilter filter; virSecretObjListACLFilter aclfilter;
unsigned int flags; unsigned int flags;
int nsecrets; int nsecrets;
bool error; bool error;
@ -554,7 +554,7 @@ virSecretObjListExportCallback(void *payload,
virObjectLock(obj); virObjectLock(obj);
def = obj->def; def = obj->def;
if (data->filter && !data->filter(data->conn, def)) if (data->aclfilter && !data->aclfilter(data->conn, def))
goto cleanup; goto cleanup;
if (!virSecretObjMatchFlags(obj, data->flags)) if (!virSecretObjMatchFlags(obj, data->flags))
@ -584,12 +584,12 @@ int
virSecretObjListExport(virConnectPtr conn, virSecretObjListExport(virConnectPtr conn,
virSecretObjListPtr secretobjs, virSecretObjListPtr secretobjs,
virSecretPtr **secrets, virSecretPtr **secrets,
virSecretObjListACLFilter filter, virSecretObjListACLFilter aclfilter,
unsigned int flags) unsigned int flags)
{ {
struct virSecretObjListData data = { struct virSecretObjListData data = {
.conn = conn, .secrets = NULL, .conn = conn, .secrets = NULL,
.filter = filter, .flags = flags, .aclfilter = aclfilter, .flags = flags,
.nsecrets = 0, .error = false }; .nsecrets = 0, .error = false };
virObjectLock(secretobjs); virObjectLock(secretobjs);
@ -623,11 +623,11 @@ int
virSecretObjListGetUUIDs(virSecretObjListPtr secrets, virSecretObjListGetUUIDs(virSecretObjListPtr secrets,
char **uuids, char **uuids,
int maxuuids, int maxuuids,
virSecretObjListACLFilter filter, virSecretObjListACLFilter aclfilter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virSecretObjListGetHelperData data = { struct virSecretObjListGetHelperData data = {
.conn = conn, .filter = filter, .nuuids = 0, .conn = conn, .aclfilter = aclfilter, .nuuids = 0,
.uuids = uuids, .maxuuids = maxuuids, .error = false }; .uuids = uuids, .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 filter, virSecretObjListACLFilter aclfilter,
virConnectPtr conn); virConnectPtr conn);
int int
virSecretObjListExport(virConnectPtr conn, virSecretObjListExport(virConnectPtr conn,
virSecretObjListPtr secretobjs, virSecretObjListPtr secretobjs,
virSecretPtr **secrets, virSecretPtr **secrets,
virSecretObjListACLFilter filter, virSecretObjListACLFilter aclfilter,
unsigned int flags); unsigned int flags);
int int
virSecretObjListGetUUIDs(virSecretObjListPtr secrets, virSecretObjListGetUUIDs(virSecretObjListPtr secrets,
char **uuids, char **uuids,
int maxuuids, int maxuuids,
virSecretObjListACLFilter filter, virSecretObjListACLFilter aclfilter,
virConnectPtr conn); virConnectPtr conn);
int int