From 8ce0556fc5a5ea10b92554440d557bacf663ec10 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Wed, 16 Aug 2017 09:26:41 -0400
Subject: [PATCH] secret: Alter @aclfilter to just @filter

Rename the variable, recent review requested just use of @filter,
so be consistent throughout.
---
 src/conf/virsecretobj.c | 24 ++++++++++++------------
 src/conf/virsecretobj.h |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index aa994ba998..4dca152d48 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -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);
diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h
index 0196813e46..d412ee6a76 100644
--- a/src/conf/virsecretobj.h
+++ b/src/conf/virsecretobj.h
@@ -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
-- 
GitLab