External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

virQEMUDriverConfigLoadSWTPMEntry: use VIR_AUTOFREE

Browse Source 
Switch the function to use VIR_AUTOFREE and VIR_AUTOPTR macros
to get rid of the cleanup section.

Requested-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2019-01-21 14:48:18 +01:00
parent 784e690ecb
commit 5de4d410a2
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_conf.c
View File

@ -984,24 +984,20 @@ static int
virQEMUDriverConfigLoadSWTPMEntry(virQEMUDriverConfigPtr cfg, virQEMUDriverConfigLoadSWTPMEntry(virQEMUDriverConfigPtr cfg,
virConfPtr conf) virConfPtr conf)
{ {
char *swtpm_user = NULL, *swtpm_group = NULL; VIR_AUTOFREE(char *) swtpm_user = NULL;
int ret = -1; VIR_AUTOFREE(char *) swtpm_group = NULL;
if (virConfGetValueString(conf, "swtpm_user", &swtpm_user) < 0) if (virConfGetValueString(conf, "swtpm_user", &swtpm_user) < 0)
goto cleanup; return -1;
if (swtpm_user && virGetUserID(swtpm_user, &cfg->swtpm_user) < 0) if (swtpm_user && virGetUserID(swtpm_user, &cfg->swtpm_user) < 0)
goto cleanup; return -1;
if (virConfGetValueString(conf, "swtpm_group", &swtpm_group) < 0) if (virConfGetValueString(conf, "swtpm_group", &swtpm_group) < 0)
goto cleanup; return -1;
if (swtpm_group && virGetGroupID(swtpm_group, &cfg->swtpm_group) < 0) if (swtpm_group && virGetGroupID(swtpm_group, &cfg->swtpm_group) < 0)
goto cleanup; return -1;
ret = 0; return 0;
cleanup:
VIR_FREE(swtpm_user);
VIR_FREE(swtpm_group);
return ret;
} }