[libvirt PATCH v2 07/10] iptablesPrivateChainCreate: Remove superfluous `goto`s
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/util/viriptables.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
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;
}
--
2.31.1