From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 5 Jul 2021 13:46:54 +0000 (+0200)
Subject: iptablesPrivateChainCreate: Remove superfluous `goto`s
X-Git-Tag: v7.6.0-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78f47cba9bdc50bb4bb6bd9a31628e12ea157973;p=thirdparty%2Flibvirt.git

iptablesPrivateChainCreate: Remove superfluous `goto`s

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 847af9b9d7..721e1eeae7 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -73,14 +73,13 @@ iptablesPrivateChainCreate(virFirewall *fw,
     g_autoptr(GHashTable) chains = virHashNew(NULL);
     g_autoptr(GHashTable) links = virHashNew(NULL);
     const char *const *tmp;
-    int ret = -1;
     size_t i;
 
     tmp = lines;
     while (tmp && *tmp) {
         if (STRPREFIX(*tmp, "-N ")) { /* eg "-N LIBVIRT_INP" */
             if (virHashUpdateEntry(chains, *tmp + 3, (void *)0x1) < 0)
-                goto cleanup;
+                return -1;
         } else if (STRPREFIX(*tmp, "-A ")) { /* eg "-A INPUT -j LIBVIRT_INP" */
             char *sep = strchr(*tmp + 3, ' ');
             if (sep) {
@@ -88,7 +87,7 @@ iptablesPrivateChainCreate(virFirewall *fw,
                 if (STRPREFIX(sep + 1, "-j ")) {
                     if (virHashUpdateEntry(links, sep + 4,
                                            (char *)*tmp + 3) < 0)
-                        goto cleanup;
+                        return -1;
                 }
             }
         }
@@ -112,9 +111,7 @@ iptablesPrivateChainCreate(virFirewall *fw,
                                "--jump", data->chains[i].child, NULL);
     }
 
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }