[libvirt PATCH 14/20] openvz: refactor openvzVEGetStringParam
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/openvz/openvz_util.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index d14254c231..9419ce122c 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -58,27 +58,22 @@ char*
openvzVEGetStringParam(virDomainPtr domain, const char* param)
{
int len;
- char *output = NULL;
+ g_autofree char *output = NULL;
- virCommand *cmd = virCommandNewArgList(VZLIST,
- "-o",
- param,
- domain->name,
- "-H", NULL);
+ g_autoptr(virCommand) cmd = virCommandNewArgList(VZLIST,
+ "-o",
+ param,
+ domain->name,
+ "-H", NULL);
virCommandSetOutputBuffer(cmd, &output);
- if (virCommandRun(cmd, NULL) < 0) {
- VIR_FREE(output);
- /* virCommandRun sets the virError */
- goto cleanup;
- }
+ if (virCommandRun(cmd, NULL) < 0)
+ return NULL;
/* delete trailing newline */
len = strlen(output);
if (len && output[len - 1] == '\n')
output[len - 1] = '\0';
- cleanup:
- virCommandFree(cmd);
- return output;
+ return g_steal_pointer(&output);
}
--
2.31.1