]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virNWFilterParseParamAttributes: Remove superfluous `goto`s
authorTim Wiederhake <twiederh@redhat.com>
Wed, 14 Jul 2021 09:11:01 +0000 (11:11 +0200)
committerTim Wiederhake <twiederh@redhat.com>
Fri, 23 Jul 2021 09:27:05 +0000 (11:27 +0200)
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/nwfilter_params.c

index 63ab7e7150cdfec7260bf4dfe0339d5e70fa3d9c..35ea0256c3c734fe88cfd36265a5428e274350a8 100644 (file)
@@ -710,28 +710,25 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
 
             if (nam == NULL || !isValidVarName(nam) ||
                 val == NULL || !isValidVarValue(val)) {
-                goto skip_entry;
+                cur = xmlNextElementSibling(cur);
+                continue;
             }
 
             if ((value = virHashLookup(table, nam))) {
                 /* add value to existing value -> list */
                 if (virNWFilterVarValueAddValue(g_steal_pointer(&value), val) < 0)
-                    goto err_exit;
+                    return NULL;
                 val = NULL;
             } else if ((value = virNWFilterParseVarValue(val))) {
                 if (virHashUpdateEntry(table, nam, value) < 0)
-                    goto err_exit;
+                    return NULL;
             }
             value = NULL;
- skip_entry:
         }
         cur = xmlNextElementSibling(cur);
     }
 
     return g_steal_pointer(&table);
-
- err_exit:
-    return NULL;
 }