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

virsh: remove variable 'ret' and 'inactive'

Browse Source 
Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-09-24 01:49:10 +02:00 committed by Michal Privoznik
parent 409ccebcaa
commit 45b17385e7
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/virsh-interface.c
View File

@ -485,26 +485,23 @@ static bool
cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd)
{ {
virInterfacePtr iface; virInterfacePtr iface;
bool ret = true;
g_autofree char *dump = NULL; g_autofree char *dump = NULL;
unsigned int flags = 0; unsigned int flags = 0;
bool inactive = vshCommandOptBool(cmd, "inactive");
if (inactive) if (vshCommandOptBool(cmd, "inactive"))
flags |= VIR_INTERFACE_XML_INACTIVE; flags |= VIR_INTERFACE_XML_INACTIVE;
if (!(iface = virshCommandOptInterface(ctl, cmd, NULL))) if (!(iface = virshCommandOptInterface(ctl, cmd, NULL)))
return false; return false;
dump = virInterfaceGetXMLDesc(iface, flags); if (!(dump = virInterfaceGetXMLDesc(iface, flags))) {
if (dump != NULL) { virInterfaceFree(iface);
vshPrint(ctl, "%s", dump); return false;
} else {
ret = false;
} }
vshPrint(ctl, "%s", dump);
virInterfaceFree(iface); virInterfaceFree(iface);
return ret; return true;
} }
/* /*

17
tools/virsh-network.c
View File

@ -360,28 +360,23 @@ static bool
cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd)
{ {
virNetworkPtr network; virNetworkPtr network;
bool ret = true;
g_autofree char *dump = NULL; g_autofree char *dump = NULL;
unsigned int flags = 0; unsigned int flags = 0;
int inactive;
if (!(network = virshCommandOptNetwork(ctl, cmd, NULL))) if (!(network = virshCommandOptNetwork(ctl, cmd, NULL)))
return false; return false;
inactive = vshCommandOptBool(cmd, "inactive"); if (vshCommandOptBool(cmd, "inactive"))
if (inactive)
flags |= VIR_NETWORK_XML_INACTIVE; flags |= VIR_NETWORK_XML_INACTIVE;
dump = virNetworkGetXMLDesc(network, flags); if (!(dump = virNetworkGetXMLDesc(network, flags))) {
virNetworkFree(network);
if (dump != NULL) { return false;
vshPrint(ctl, "%s", dump);
} else {
ret = false;
} }
vshPrint(ctl, "%s", dump);
virNetworkFree(network); virNetworkFree(network);
return ret; return true;
} }
/* /*