External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-26 15:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

secret: Rename virSecretObjPtr 'entry' to 'secret'

Browse Source 
Just renaming the variable in secretConnectListAllSecrets.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-02-23 18:16:21 -05:00
parent bfd25584b4
commit ca1eb18113
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/secret/secret_driver.c
View File

@ -576,7 +576,7 @@ secretConnectListAllSecrets(virConnectPtr conn,
virSecretPtr *tmp_secrets = NULL; virSecretPtr *tmp_secrets = NULL;
int nsecrets = 0; int nsecrets = 0;
int ret_nsecrets = 0; int ret_nsecrets = 0;
virSecretObjPtr entry = NULL; virSecretObjPtr secret = NULL;
size_t i = 0; size_t i = 0;
int ret = -1; int ret = -1;
@ -587,39 +587,39 @@ secretConnectListAllSecrets(virConnectPtr conn,
secretDriverLock(); secretDriverLock();
for (entry = driver->secrets; entry != NULL; entry = entry->next) for (secret = driver->secrets; secret != NULL; secret = secret->next)
nsecrets++; nsecrets++;
if (secrets && VIR_ALLOC_N(tmp_secrets, nsecrets + 1) < 0) if (secrets && VIR_ALLOC_N(tmp_secrets, nsecrets + 1) < 0)
goto cleanup; goto cleanup;
for (entry = driver->secrets; entry != NULL; entry = entry->next) { for (secret = driver->secrets; secret != NULL; secret = secret->next) {
if (!virConnectListAllSecretsCheckACL(conn, if (!virConnectListAllSecretsCheckACL(conn,
entry->def)) secret->def))
continue; continue;
/* filter by whether it's ephemeral */ /* filter by whether it's ephemeral */
if (MATCH(VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL) && if (MATCH(VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL) &&
!((MATCH(VIR_CONNECT_LIST_SECRETS_EPHEMERAL) && !((MATCH(VIR_CONNECT_LIST_SECRETS_EPHEMERAL) &&
entry->def->ephemeral) || secret->def->ephemeral) ||
(MATCH(VIR_CONNECT_LIST_SECRETS_NO_EPHEMERAL) && (MATCH(VIR_CONNECT_LIST_SECRETS_NO_EPHEMERAL) &&
!entry->def->ephemeral))) !secret->def->ephemeral)))
continue; continue;
/* filter by whether it's private */ /* filter by whether it's private */
if (MATCH(VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE) && if (MATCH(VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE) &&
!((MATCH(VIR_CONNECT_LIST_SECRETS_PRIVATE) && !((MATCH(VIR_CONNECT_LIST_SECRETS_PRIVATE) &&
entry->def->private) || secret->def->private) ||
(MATCH(VIR_CONNECT_LIST_SECRETS_NO_PRIVATE) && (MATCH(VIR_CONNECT_LIST_SECRETS_NO_PRIVATE) &&
!entry->def->private))) !secret->def->private)))
continue; continue;
if (secrets) { if (secrets) {
if (!(tmp_secrets[ret_nsecrets] = if (!(tmp_secrets[ret_nsecrets] =
virGetSecret(conn, virGetSecret(conn,
entry->def->uuid, secret->def->uuid,
entry->def->usage_type, secret->def->usage_type,
secretUsageIDForDef(entry->def)))) secretUsageIDForDef(secret->def))))
goto cleanup; goto cleanup;
} }
ret_nsecrets++; ret_nsecrets++;