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

virsh: secret: Refactor cleanup in cmdSecretSetValue

Browse Source 
Automatically clean the secret object and get rid of the cleanup label
and 'ret' valiable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2020-01-24 15:42:02 +01:00
parent 7e8ed7d782
commit 66770bc6f5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/virsh-secret.c
View File

@ -188,18 +188,17 @@ static const vshCmdOptDef opts_secret_set_value[] = {
static bool static bool
cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
{ {
virSecretPtr secret; g_autoptr(virshSecret) secret = NULL;
size_t value_size; size_t value_size;
const char *base64 = NULL; const char *base64 = NULL;
unsigned char *value; unsigned char *value;
int res; int res;
bool ret = false;
if (!(secret = virshCommandOptSecret(ctl, cmd, NULL))) if (!(secret = virshCommandOptSecret(ctl, cmd, NULL)))
return false; return false;
if (vshCommandOptStringReq(ctl, cmd, "base64", &base64) < 0) if (vshCommandOptStringReq(ctl, cmd, "base64", &base64) < 0)
goto cleanup; return false;
value = g_base64_decode(base64, &value_size); value = g_base64_decode(base64, &value_size);
@ -209,14 +208,10 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
if (res != 0) { if (res != 0) {
vshError(ctl, "%s", _("Failed to set secret value")); vshError(ctl, "%s", _("Failed to set secret value"));
goto cleanup; return false;
} }
vshPrintExtra(ctl, "%s", _("Secret value set\n")); vshPrintExtra(ctl, "%s", _("Secret value set\n"));
ret = true; return true;
cleanup:
virshSecretFree(secret);
return ret;
} }
/* /*