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: Split apart NumOfSecrets and GetUUIDs callback function

Browse Source 
Rather than overloading one function - split apart the logic to have
separate interfaces and local/private structures to manage the data
for which the helper is collecting.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-03 09:03:47 -04:00
parent 05f3a91196
commit 850792f2d3
1 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/conf/virsecretobj.c
View File

@ -433,7 +433,36 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
} }
struct virSecretObjListGetHelperData { struct virSecretCountData {
virConnectPtr conn;
virSecretObjListACLFilter aclfilter;
int count;
};
static int
virSecretObjListNumOfSecretsCallback(void *payload,
const void *name ATTRIBUTE_UNUSED,
void *opaque)
{
struct virSecretCountData *data = opaque;
virSecretObjPtr obj = payload;
virSecretDefPtr def;
virObjectLock(obj);
def = obj->def;
if (data->aclfilter && !data->aclfilter(data->conn, def))
goto cleanup;
data->count++;
cleanup:
virObjectUnlock(obj);
return 0;
}
struct virSecretListData {
virConnectPtr conn; virConnectPtr conn;
virSecretObjListACLFilter aclfilter; virSecretObjListACLFilter aclfilter;
int nuuids; int nuuids;
@ -444,11 +473,11 @@ struct virSecretObjListGetHelperData {
static int static int
virSecretObjListGetHelper(void *payload, virSecretObjListGetUUIDsCallback(void *payload,
const void *name ATTRIBUTE_UNUSED, const void *name ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
struct virSecretObjListGetHelperData *data = opaque; struct virSecretListData *data = opaque;
virSecretObjPtr obj = payload; virSecretObjPtr obj = payload;
virSecretDefPtr def; virSecretDefPtr def;
@ -473,11 +502,9 @@ virSecretObjListGetHelper(void *payload,
} }
virUUIDFormat(def->uuid, uuidstr); virUUIDFormat(def->uuid, uuidstr);
data->uuids[data->nuuids] = uuidstr; data->uuids[data->nuuids++] = uuidstr;
} }
data->nuuids++;
cleanup: cleanup:
virObjectUnlock(obj); virObjectUnlock(obj);
return 0; return 0;
@ -489,15 +516,14 @@ virSecretObjListNumOfSecrets(virSecretObjListPtr secrets,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter aclfilter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virSecretObjListGetHelperData data = { struct virSecretCountData data = {
.conn = conn, .aclfilter = aclfilter, .nuuids = 0, .conn = conn, .aclfilter = aclfilter, .count = 0 };
.uuids = NULL, .maxuuids = -1, .error = false };
virObjectLock(secrets); virObjectLock(secrets);
virHashForEach(secrets->objs, virSecretObjListGetHelper, &data); virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &data);
virObjectUnlock(secrets); virObjectUnlock(secrets);
return data.nuuids; return data.count;
} }
@ -626,12 +652,12 @@ virSecretObjListGetUUIDs(virSecretObjListPtr secrets,
virSecretObjListACLFilter aclfilter, virSecretObjListACLFilter aclfilter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virSecretObjListGetHelperData data = { struct virSecretListData data = {
.conn = conn, .aclfilter = aclfilter, .nuuids = 0, .conn = conn, .aclfilter = aclfilter, .uuids = uuids, .nuuids = 0,
.uuids = uuids, .maxuuids = maxuuids, .error = false }; .maxuuids = maxuuids, .error = false };
virObjectLock(secrets); virObjectLock(secrets);
virHashForEach(secrets->objs, virSecretObjListGetHelper, &data); virHashForEach(secrets->objs, virSecretObjListGetUUIDsCallback, &data);
virObjectUnlock(secrets); virObjectUnlock(secrets);
if (data.error) if (data.error)