External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNWFilterParseParamAttributes: Simplify loop body

Browse Source 
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:08:50 +02:00
parent 84ac5beeac
commit 8ca6d834ad
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/conf/nwfilter_params.c
View File

@ -707,28 +707,22 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
g_autofree char *nam = virXMLPropString(cur, "name");
g_autofree char *val = virXMLPropString(cur, "value");
g_autoptr(virNWFilterVarValue) value = NULL;
if (nam != NULL && val != NULL) {
if (!isValidVarName(nam))
goto skip_entry;
if (!isValidVarValue(val))
goto skip_entry;
value = virHashLookup(table, nam);
if (value) {
/* add value to existing value -> list */
if (virNWFilterVarValueAddValue(value, val) < 0) {
value = NULL;
goto err_exit;
}
val = NULL;
} else {
value = virNWFilterParseVarValue(val);
if (!value)
goto skip_entry;
if (virHashUpdateEntry(table, nam, value) < 0)
goto err_exit;
}
value = NULL;
if (nam == NULL || !isValidVarName(nam) ||
val == NULL || !isValidVarValue(val)) {
goto skip_entry;
}
if ((value = virHashLookup(table, nam))) {
/* add value to existing value -> list */
if (virNWFilterVarValueAddValue(g_steal_pointer(&value), val) < 0)
goto err_exit;
val = NULL;
} else if ((value = virNWFilterParseVarValue(val))) {
if (virHashUpdateEntry(table, nam, value) < 0)
goto err_exit;
}
value = NULL;
skip_entry:
}
cur = xmlNextElementSibling(cur);