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

virInterfaceDefParseProtoIPv6: 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 2723eec2ec..71da243f6a 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -302,17 +302,14 @@ static int
 virInterfaceDefParseProtoIPv6(virInterfaceProtocolDef *def,
                               xmlXPathContextPtr ctxt)
 {
-    xmlNodePtr dhcp, autoconf;
+    xmlNodePtr dhcp;
     g_autofree xmlNodePtr *ipNodes = NULL;
     int nipNodes;
     size_t i;
-    char *tmp;
 
-    tmp = virXPathString("string(./route[1]/@gateway)", ctxt);
-    def->gateway = tmp;
+    def->gateway = virXPathString("string(./route[1]/@gateway)", ctxt);
 
-    autoconf = virXPathNode("./autoconf", ctxt);
-    if (autoconf != NULL)
+    if (virXPathNode("./autoconf", ctxt) != NULL)
         def->autoconf = 1;
 
     dhcp = virXPathNode("./dhcp", ctxt);
@@ -331,10 +328,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDef *def,
 
     def->nips = 0;
     for (i = 0; i < nipNodes; i++) {
-
-        virInterfaceIPDef *ip;
-
-        ip = g_new0(virInterfaceIPDef, 1);
+        virInterfaceIPDef *ip = g_new0(virInterfaceIPDef, 1);
 
         if (virInterfaceDefParseIP(ip, ipNodes[i]) < 0) {
             virInterfaceIPDefFree(ip);