External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 07:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: remove unneeded labels

Browse Source 
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-01-06 18:57:31 -03:00 committed by Erik Skultety
parent 05a18bbb07
commit 54370ad9d9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -1046,7 +1046,7 @@ iptablesHandlePortData(virFirewallPtr fw,
if (printDataType(vars, if (printDataType(vars,
portstr, sizeof(portstr), portstr, sizeof(portstr),
&portData->dataSrcPortStart) < 0) &portData->dataSrcPortStart) < 0)
goto err_exit; return -1;
if (ENTRY_WANT_NEG_SIGN(&portData->dataSrcPortStart)) if (ENTRY_WANT_NEG_SIGN(&portData->dataSrcPortStart))
virFirewallRuleAddArg(fw, fwrule, "!"); virFirewallRuleAddArg(fw, fwrule, "!");
@ -1056,7 +1056,7 @@ iptablesHandlePortData(virFirewallPtr fw,
if (printDataType(vars, if (printDataType(vars,
portstralt, sizeof(portstralt), portstralt, sizeof(portstralt),
&portData->dataSrcPortEnd) < 0) &portData->dataSrcPortEnd) < 0)
goto err_exit; return -1;
virFirewallRuleAddArgFormat(fw, fwrule, virFirewallRuleAddArgFormat(fw, fwrule,
"%s:%s", portstr, portstralt); "%s:%s", portstr, portstralt);
@ -1069,7 +1069,7 @@ iptablesHandlePortData(virFirewallPtr fw,
if (printDataType(vars, if (printDataType(vars,
portstr, sizeof(portstr), portstr, sizeof(portstr),
&portData->dataDstPortStart) < 0) &portData->dataDstPortStart) < 0)
goto err_exit; return -1;
if (ENTRY_WANT_NEG_SIGN(&portData->dataDstPortStart)) if (ENTRY_WANT_NEG_SIGN(&portData->dataDstPortStart))
virFirewallRuleAddArg(fw, fwrule, "!"); virFirewallRuleAddArg(fw, fwrule, "!");
@ -1079,7 +1079,7 @@ iptablesHandlePortData(virFirewallPtr fw,
if (printDataType(vars, if (printDataType(vars,
portstralt, sizeof(portstralt), portstralt, sizeof(portstralt),
&portData->dataDstPortEnd) < 0) &portData->dataDstPortEnd) < 0)
goto err_exit; return -1;
virFirewallRuleAddArgFormat(fw, fwrule, virFirewallRuleAddArgFormat(fw, fwrule,
"%s:%s", portstr, portstralt); "%s:%s", portstr, portstralt);
@ -1089,9 +1089,6 @@ iptablesHandlePortData(virFirewallPtr fw,
} }
return 0; return 0;
err_exit:
return -1;
} }

3
src/nwfilter/nwfilter_learnipaddr.c
View File

@ -725,7 +725,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver,
} }
if (VIR_ALLOC(req) < 0) if (VIR_ALLOC(req) < 0)
goto err_no_req; return -1;
if (!(req->binding = virNWFilterBindingDefCopy(binding))) if (!(req->binding = virNWFilterBindingDefCopy(binding)))
goto err_free_req; goto err_free_req;
@ -752,7 +752,6 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver,
virNWFilterDeregisterLearnReq(ifindex); virNWFilterDeregisterLearnReq(ifindex);
err_free_req: err_free_req:
virNWFilterIPAddrLearnReqFree(req); virNWFilterIPAddrLearnReqFree(req);
err_no_req:
return -1; return -1;
} }