[libvirt] [PATCH 6/6] Change CMD_STOPONERR(1) to use true

The CMD_STOPONERR macro uses its parameter as a boolean, so should be passed true rather than 1. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/nwfilter/nwfilter_ebiptables_driver.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 0927552..842d2d2 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -795,7 +795,7 @@ iptablesSetupVirtInPost(virBufferPtr buf, "fi\n", PHYSDEV_IN, ifname, match, ifname, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); } @@ -3244,7 +3244,7 @@ ebtablesApplyBasicRules(const char *ifname, "%s", chain, macaddr_str, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); virBufferAsprintf(&buf, CMD_DEF("$EBT -t nat -A %s -p IPv4 -j ACCEPT") CMD_SEPARATOR @@ -3252,7 +3252,7 @@ ebtablesApplyBasicRules(const char *ifname, "%s", chain, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); virBufferAsprintf(&buf, CMD_DEF("$EBT -t nat -A %s -p ARP -j ACCEPT") CMD_SEPARATOR @@ -3260,7 +3260,7 @@ ebtablesApplyBasicRules(const char *ifname, "%s", chain, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); virBufferAsprintf(&buf, CMD_DEF("$EBT -t nat -A %s -j DROP") CMD_SEPARATOR @@ -3268,7 +3268,7 @@ ebtablesApplyBasicRules(const char *ifname, "%s", chain, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); ebtablesLinkTmpRootChain(&buf, true, ifname); ebtablesRenameTmpRootChain(&buf, true, ifname); @@ -3349,7 +3349,7 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, chain_in, macaddr_str, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); virBufferAsprintf(&buf, CMD_DEF("$EBT -t nat -A %s -j DROP") CMD_SEPARATOR @@ -3357,7 +3357,7 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, "%s", chain_in, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); num_dhcpsrvrs = (dhcpsrvrs != NULL) ? virNWFilterVarValueGetCardinality(dhcpsrvrs) @@ -3394,7 +3394,7 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, chain_out, (ctr == 0) ? macaddr_str : "ff:ff:ff:ff:ff:ff", srcIPParam != NULL ? srcIPParam : "", - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); } VIR_FREE(srcIPParam); @@ -3411,7 +3411,7 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, "%s", chain_out, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); ebtablesLinkTmpRootChain(&buf, true, ifname); ebtablesLinkTmpRootChain(&buf, false, ifname); @@ -3476,7 +3476,7 @@ ebtablesApplyDropAllRules(const char *ifname) "%s", chain_in, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); virBufferAsprintf(&buf, CMD_DEF("$EBT -t nat -A %s -j DROP") CMD_SEPARATOR @@ -3484,7 +3484,7 @@ ebtablesApplyDropAllRules(const char *ifname) "%s", chain_out, - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); ebtablesLinkTmpRootChain(&buf, true, ifname); ebtablesLinkTmpRootChain(&buf, false, ifname); @@ -4180,7 +4180,7 @@ ebiptablesDriverInitWithFirewallD(void) CMD_DEF("$FWC --state") CMD_SEPARATOR CMD_EXEC "%s", - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); if (ebiptablesExecCLI(&buf, false, &output) < 0) { VIR_INFO("firewalld support disabled for nwfilter"); @@ -4249,7 +4249,7 @@ ebiptablesDriverTestCLITools(void) CMD_DEF("$EBT -t nat -L") CMD_SEPARATOR CMD_EXEC "%s", - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); if (ebiptablesExecCLI(&buf, false, &errmsg) < 0) { VIR_FREE(ebtables_cmd_path); @@ -4266,7 +4266,7 @@ ebiptablesDriverTestCLITools(void) CMD_DEF("$IPT -n -L FORWARD") CMD_SEPARATOR CMD_EXEC "%s", - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); if (ebiptablesExecCLI(&buf, false, &errmsg) < 0) { VIR_FREE(iptables_cmd_path); @@ -4283,7 +4283,7 @@ ebiptablesDriverTestCLITools(void) CMD_DEF("$IPT -n -L FORWARD") CMD_SEPARATOR CMD_EXEC "%s", - CMD_STOPONERR(1)); + CMD_STOPONERR(true)); if (ebiptablesExecCLI(&buf, false, &errmsg) < 0) { VIR_FREE(ip6tables_cmd_path); -- 1.8.5.3