External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: use g_autofree and remove unnecessary label

Browse Source 
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>
This commit is contained in:
Jiang Jiacheng 2023-01-06 17:18:39 +08:00 committed by Ján Tomko
parent e26c5d1212
commit ffd286ac6f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vz/vz_utils.c
View File

@ -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