External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh-domain.c: use g_auto* in cmdDetachDevice()

Browse Source 
Use g_auto* pointers to avoid the need of a cleanup label. The
type of the pointer 'virDomainPtr dom' was changed to its alias
'virshDomainPtr' to allow the use of g_autoptr().

Reviewed-by: Laine Stump <laine@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2021-01-04 09:54:37 -03:00
parent fae5e343fb
commit 953be56eea
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/virsh-domain.c
View File

@ -11948,11 +11948,10 @@ static const vshCmdOptDef opts_detach_device[] = {
static bool static bool
cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainPtr dom = NULL; g_autoptr(virshDomain) dom = NULL;
const char *from = NULL; const char *from = NULL;
char *buffer = NULL; g_autofree char *buffer = NULL;
int ret; int ret;
bool funcRet = false;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
@ -11977,11 +11976,11 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
flags |= VIR_DOMAIN_AFFECT_LIVE; flags |= VIR_DOMAIN_AFFECT_LIVE;
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
goto cleanup; return false;
if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) {
vshReportError(ctl); vshReportError(ctl);
goto cleanup; return false;
} }
if (flags != 0 || current) if (flags != 0 || current)
@ -11991,16 +11990,11 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
if (ret < 0) { if (ret < 0) {
vshError(ctl, _("Failed to detach device from %s"), from); vshError(ctl, _("Failed to detach device from %s"), from);
goto cleanup; return false;
} }
vshPrintExtra(ctl, "%s", _("Device detached successfully\n")); vshPrintExtra(ctl, "%s", _("Device detached successfully\n"));
funcRet = true; return true;
cleanup:
VIR_FREE(buffer);
virshDomainFree(dom);
return funcRet;
} }