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

virSecretGetSecretString: Refactor cleanup

Browse Source 
Automatically free 'sec' and remove the 'cleanup' section and 'ret'
variables.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-12-08 12:28:13 +01:00
parent a754ee59d8
commit 4102acc608
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/virsecret.c
View File

@ -139,8 +139,7 @@ virSecretGetSecretString(virConnectPtr conn,
uint8_t **secret, uint8_t **secret,
size_t *secret_size) size_t *secret_size)
{ {
virSecretPtr sec = NULL; g_autoptr(virSecret) sec = NULL;
int ret = -1;
switch (seclookupdef->type) { switch (seclookupdef->type) {
case VIR_SECRET_LOOKUP_TYPE_UUID: case VIR_SECRET_LOOKUP_TYPE_UUID:
@ -154,7 +153,7 @@ virSecretGetSecretString(virConnectPtr conn,
} }
if (!sec) if (!sec)
goto cleanup; return -1;
/* NB: NONE is a byproduct of the qemuxml2argvtest test mocking /* NB: NONE is a byproduct of the qemuxml2argvtest test mocking
* for UUID lookups. Normal secret XML processing would fail if * for UUID lookups. Normal secret XML processing would fail if
@ -170,17 +169,11 @@ virSecretGetSecretString(virConnectPtr conn,
"expected '%s' type"), "expected '%s' type"),
uuidstr, virSecretUsageTypeToString(sec->usageType), uuidstr, virSecretUsageTypeToString(sec->usageType),
virSecretUsageTypeToString(secretUsageType)); virSecretUsageTypeToString(secretUsageType));
goto cleanup; return -1;
} }
*secret = conn->secretDriver->secretGetValue(sec, secret_size, 0); if (!(*secret = conn->secretDriver->secretGetValue(sec, secret_size, 0)))
return -1;
if (!*secret) return 0;
goto cleanup;
ret = 0;
cleanup:
virObjectUnref(sec);
return ret;
} }