From e86d62f8f7611a4cea502821373464b84df5de1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 13 Dec 2021 18:33:11 +0100 Subject: [PATCH] vmware: refactor vmwareExtractVersion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use g_auto for cleanup and remove the cleanup label. Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- src/vmware/vmware_conf.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 17e67ea6d2..c88f11fcab 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -242,11 +242,10 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version) int vmwareExtractVersion(struct vmware_driver *driver) { - int ret = -1; - virCommand *cmd = NULL; - char * outbuf = NULL; - char *bin = NULL; - char *vmwarePath = NULL; + g_autoptr(virCommand) cmd = NULL; + g_autofree char *outbuf = NULL; + g_autofree char *bin = NULL; + g_autofree char *vmwarePath = NULL; vmwarePath = g_path_get_dirname(driver->vmrun); @@ -266,7 +265,7 @@ vmwareExtractVersion(struct vmware_driver *driver) default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid driver type for version detection")); - goto cleanup; + return -1; } cmd = virCommandNewArgList(bin, "-v", NULL); @@ -274,19 +273,12 @@ vmwareExtractVersion(struct vmware_driver *driver) virCommandSetErrorBuffer(cmd, &outbuf); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; if (vmwareParseVersionStr(driver->type, outbuf, &driver->version) < 0) - goto cleanup; + return -1; - ret = 0; - - cleanup: - virCommandFree(cmd); - VIR_FREE(outbuf); - VIR_FREE(bin); - VIR_FREE(vmwarePath); - return ret; + return 0; } int