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

util: eliminate pointless switch in virFirewallApplyRule

Browse Source 
Since commit b19863640 both useful cases of the switch statement in
this function have made the same call (and the other/default case is
just an error that can never happen). Eliminate the switch to help
eliminate use of currentBackend.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2021-11-16 12:19:18 -05:00
parent 3d37406626
commit 9e8e639fd7
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/util/virfirewall.c
View File

@ -653,31 +653,8 @@ virFirewallApplyRule(virFirewall *firewall,
if (rule->ignoreErrors)
ignoreErrors = rule->ignoreErrors;
switch (currentBackend) {
case VIR_FIREWALL_BACKEND_DIRECT:
if (virFirewallApplyRuleDirect(rule, ignoreErrors, &output) < 0)
return -1;
break;
case VIR_FIREWALL_BACKEND_FIREWALLD:
/* Since we are using raw iptables rules, there is no
* advantage to going through firewalld, so instead just add
* them directly rather that via dbus calls to firewalld. This
* has the useful side effect of eliminating extra unwanted
* warning messages in the system logs when trying to delete
* rules that don't exist (which is something that happens
* often when libvirtd is started, and *always* when firewalld
* is restarted)
*/
if (virFirewallApplyRuleDirect(rule, ignoreErrors, &output) < 0)
return -1;
break;
case VIR_FIREWALL_BACKEND_AUTOMATIC:
case VIR_FIREWALL_BACKEND_LAST:
default:
virReportEnumRangeError(virFirewallBackend, currentBackend);
if (virFirewallApplyRuleDirect(rule, ignoreErrors, &output) < 0)
return -1;
}
if (rule->queryCB && output) {
if (!(lines = g_strsplit(output, "\n", -1)))