From ffd286ac6f25374d16f4eaa7ff64e30c77541b41 Mon Sep 17 00:00:00 2001 From: Jiang Jiacheng Date: Fri, 6 Jan 2023 17:18:39 +0800 Subject: [PATCH] vz: use g_autofree and remove unnecessary label MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- src/vz/vz_utils.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index fcf6d363a9..219d13823b 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -151,7 +151,8 @@ vzInitCaps(unsigned long vzVersion, struct _vzCapabilities *vzCaps) int vzInitVersion(struct _vzDriver *driver) { - char *output, *sVer, *tmp; + g_autofree char *output = NULL; + char *sVer, *tmp; const char *searchStr = "prlsrvctl version "; int ret = -1; @@ -159,12 +160,12 @@ vzInitVersion(struct _vzDriver *driver) if (!output) { vzParseError(); - goto cleanup; + return -1; } if (!(sVer = strstr(output, searchStr))) { vzParseError(); - goto cleanup; + return -1; } sVer = sVer + strlen(searchStr); @@ -173,26 +174,23 @@ vzInitVersion(struct _vzDriver *driver) * In libvirt we handle only first two numbers. */ if (!(tmp = strchr(sVer, '.'))) { vzParseError(); - goto cleanup; + return -1; } if (!(tmp = strchr(tmp + 1, '.'))) { vzParseError(); - goto cleanup; + return -1; } tmp[0] = '\0'; if (virStringParseVersion(&(driver->vzVersion), sVer, true) < 0) { vzParseError(); - goto cleanup; + return -1; } vzInitCaps(driver->vzVersion, &driver->vzCaps); - ret = 0; - cleanup: - VIR_FREE(output); - return ret; + return 0; } static int -- 2.47.2