[PATCH 11/11] virSecretGetSecretString: Refactor cleanup
Automatically free 'sec' and remove the 'cleanup' section and
'ret'
variables.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/util/virsecret.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/util/virsecret.c b/src/util/virsecret.c
index c01f3fb967..f2c13e27c9 100644
--- a/src/util/virsecret.c
+++ b/src/util/virsecret.c
@@ -139,8 +139,7 @@ virSecretGetSecretString(virConnectPtr conn,
uint8_t **secret,
size_t *secret_size)
{
- virSecretPtr sec = NULL;
- int ret = -1;
+ g_autoptr(virSecret) sec = NULL;
switch (seclookupdef->type) {
case VIR_SECRET_LOOKUP_TYPE_UUID:
@@ -154,7 +153,7 @@ virSecretGetSecretString(virConnectPtr conn,
}
if (!sec)
- goto cleanup;
+ return -1;
/* NB: NONE is a byproduct of the qemuxml2argvtest test mocking
* for UUID lookups. Normal secret XML processing would fail if
@@ -170,17 +169,11 @@ virSecretGetSecretString(virConnectPtr conn,
"expected '%s' type"),
uuidstr, virSecretUsageTypeToString(sec->usageType),
virSecretUsageTypeToString(secretUsageType));
- goto cleanup;
+ return -1;
}
- *secret = conn->secretDriver->secretGetValue(sec, secret_size, 0);
-
- if (!*secret)
- goto cleanup;
-
- ret = 0;
+ if (!(*secret = conn->secretDriver->secretGetValue(sec, secret_size, 0)))
+ return -1;
- cleanup:
- virObjectUnref(sec);
- return ret;
+ return 0;
}
--
2.38.1