From: Tim Wiederhake <twiederh@redhat.com>
Date: Fri, 23 Jul 2021 09:42:47 +0000 (+0200)
Subject: virNWFilterParseParamAttributes: Simplify loop
X-Git-Tag: v7.7.0-rc1~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49d2a42b69b68d8b04dc976ee947f18367695911;p=thirdparty%2Flibvirt.git

virNWFilterParseParamAttributes: Simplify loop

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 35ea0256c3..ca7b62874c 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -700,9 +700,8 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
 {
     g_autoptr(GHashTable) table = virHashNew(virNWFilterVarValueHashFree);
 
-    cur = xmlFirstElementChild(cur);
-
-    while (cur != NULL) {
+    for (cur = xmlFirstElementChild(cur); cur != NULL;
+         cur = xmlNextElementSibling(cur)) {
         if (virXMLNodeNameEqual(cur, "parameter")) {
             g_autofree char *nam = virXMLPropString(cur, "name");
             g_autofree char *val = virXMLPropString(cur, "value");
@@ -710,7 +709,6 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
 
             if (nam == NULL || !isValidVarName(nam) ||
                 val == NULL || !isValidVarValue(val)) {
-                cur = xmlNextElementSibling(cur);
                 continue;
             }
 
@@ -725,7 +723,6 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
             }
             value = NULL;
         }
-        cur = xmlNextElementSibling(cur);
     }
 
     return g_steal_pointer(&table);