From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 12 Jan 2022 12:41:39 +0000 (+0100)
Subject: virInterfaceDefParse: Simplify and cleanup
X-Git-Tag: v8.1.0-rc1~461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f6e198bfaa10db7387d32580fced68fea1574b;p=thirdparty%2Flibvirt.git

virInterfaceDefParse: Simplify and cleanup

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 6cb219437a..424650489c 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -704,14 +704,13 @@ virInterfaceDefParse(const char *xmlStr,
                      unsigned int flags)
 {
     g_autoptr(xmlDoc) xml = NULL;
-    virInterfaceDef *def = NULL;
 
-    if ((xml = virXMLParse(filename, xmlStr, _("(interface_definition)"), "interface.rng",
-                           flags & VIR_INTERFACE_DEFINE_VALIDATE))) {
-        def = virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml));
-    }
+    xml = virXMLParse(filename, xmlStr, _("(interface_definition)"),
+                      "interface.rng", flags & VIR_INTERFACE_DEFINE_VALIDATE);
+    if (!xml)
+        return NULL;
 
-    return def;
+    return virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml));
 }