]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virNWFilterParseParamAttributes: Simplify loop
authorTim Wiederhake <twiederh@redhat.com>
Fri, 23 Jul 2021 09:42:47 +0000 (11:42 +0200)
committerTim Wiederhake <twiederh@redhat.com>
Wed, 4 Aug 2021 08:39:27 +0000 (10:39 +0200)
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/nwfilter_params.c

index 35ea0256c3c734fe88cfd36265a5428e274350a8..ca7b62874cffee26583f47e4400f1798ee767ad7 100644 (file)
@@ -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);