mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 05:45:46 +00:00
virsh: remove variable 'ret' and 'inactive'
Signed-off-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
409ccebcaa
commit
45b17385e7
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user