From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 14 Jul 2021 09:11:01 +0000 (+0200)
Subject: virNWFilterParseParamAttributes: Remove superfluous `goto`s
X-Git-Tag: v7.6.0-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7520984c1c50e615d2be7d86b4317d1fe6beff8c;p=thirdparty%2Flibvirt.git

virNWFilterParseParamAttributes: Remove superfluous `goto`s

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 63ab7e7150..35ea0256c3 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -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;
 }