1
0

virNWFilterParseParamAttributes: Remove superfluous gotos

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-07-14 11:11:01 +02:00
parent 8ca6d834ad
commit 7520984c1c

View File

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