diff options
author | Jiang Jiacheng <jiangjiacheng@huawei.com> | 2023-01-06 17:18:39 +0800 |
---|---|---|
committer | Ján Tomko <jtomko@redhat.com> | 2023-01-09 04:38:52 +0100 |
commit | ffd286ac6f25374d16f4eaa7ff64e30c77541b41 (patch) | |
tree | 1eb4240176a3ac7d74d8fb8a49b7209bf65d12d0 /src | |
parent | e26c5d1212469b8540dc9beef2fb76e7bd2de667 (diff) | |
download | libvirt-ffd286ac6f25374d16f4eaa7ff64e30c77541b41.tar.gz |
vz: use g_autofree and remove unnecessary label
Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/vz/vz_utils.c | 18 |
1 files 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 |