NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virNWFilterParseParamAttributes: Remove tautological if

Browse Source 
`cur` is guaranteed to be of type `XML_ELEMENT_NODE` by using
`xmlFirstElementChild()` and `xmlNextElementSibling()`.

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 10:42:58 +02:00
parent 71a2cdb8ec
commit ec5838fc17
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/conf/nwfilter_params.c
View File

@ -706,39 +706,38 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
cur = xmlFirstElementChild(cur); cur = xmlFirstElementChild(cur);
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (virXMLNodeNameEqual(cur, "parameter")) {
if (virXMLNodeNameEqual(cur, "parameter")) { nam = virXMLPropString(cur, "name");
nam = virXMLPropString(cur, "name"); val = virXMLPropString(cur, "value");
val = virXMLPropString(cur, "value"); value = NULL;
value = NULL; if (nam != NULL && val != NULL) {
if (nam != NULL && val != NULL) { if (!isValidVarName(nam))
if (!isValidVarName(nam)) goto skip_entry;
goto skip_entry; if (!isValidVarValue(val))
if (!isValidVarValue(val)) goto skip_entry;
goto skip_entry; value = virHashLookup(table, nam);
value = virHashLookup(table, nam); if (value) {
if (value) { /* add value to existing value -> list */
/* add value to existing value -> list */ if (virNWFilterVarValueAddValue(value, val) < 0) {
if (virNWFilterVarValueAddValue(value, val) < 0) { value = NULL;
value = NULL; goto err_exit;
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; val = NULL;
} else {
value = virNWFilterParseVarValue(val);
if (!value)
goto skip_entry;
if (virHashUpdateEntry(table, nam, value) < 0)
goto err_exit;
} }
skip_entry: value = NULL;
virNWFilterVarValueFree(value);
VIR_FREE(nam);
VIR_FREE(val);
} }
skip_entry:
virNWFilterVarValueFree(value);
VIR_FREE(nam);
VIR_FREE(val);
} }
cur = xmlNextElementSibling(cur); cur = xmlNextElementSibling(cur);
} }
return table; return table;