From 6c7c7cabf9889cd9852f0fbb8191238812e085f5 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 15 Jan 2013 13:38:18 -0500 Subject: [PATCH] virsh: Remove unused setting of 'br_node' and 'if_node' --- tools/virsh-interface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index cd14e89170..1e047b2153 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -920,7 +920,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) int if_xml_size; xmlDocPtr xml_doc = NULL; xmlXPathContextPtr ctxt = NULL; - xmlNodePtr top_node, br_node, if_node, cur; + xmlNodePtr top_node, if_node, cur; /* Get a handle to the original device */ if (!(br_handle = vshCommandOptInterfaceBy(ctl, cmd, "bridge", @@ -963,12 +963,12 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) VIR_FREE(if_name); /* Find the node under . */ - if (!(br_node = virXPathNode("./bridge", ctxt))) { + if (virXPathNode("./bridge", ctxt) == NULL) { vshError(ctl, "%s", _("No bridge node in xml document")); goto cleanup; } - if ((if_node = virXPathNode("./bridge/interface[2]", ctxt))) { + if (virXPathNode("./bridge/interface[2]", ctxt) != NULL) { vshError(ctl, "%s", _("Multiple interfaces attached to bridge")); goto cleanup; } -- GitLab