[libvirt] [PATCH 4/6] Remove pointless return values in nwfilter methods

Many nwfilter methods have an int return value but only ever return 0 and their callers never check the return value either. These methods can all be void. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/nwfilter/nwfilter_ebiptables_driver.c | 157 ++++++++++++------------------ 1 file changed, 61 insertions(+), 96 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 640c5fe..63ccfe6 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -206,7 +206,7 @@ static const char *m_physdev_out_old_str = "-m physdev " PHYSDEV_OUT_OLD; static int ebtablesRemoveBasicRules(const char *ifname); static int ebiptablesDriverInit(bool privileged); static void ebiptablesDriverShutdown(void); -static int ebtablesCleanAll(const char *ifname); +static void ebtablesCleanAll(const char *ifname); static int ebiptablesAllTeardown(const char *ifname); static virMutex execCLIMutex; @@ -582,10 +582,11 @@ ebtablesHandleEthHdr(virBufferPtr buf, /************************ iptables support ************************/ -static int iptablesLinkIPTablesBaseChain(virBufferPtr buf, - const char *udchain, - const char *syschain, - unsigned int pos) +static void +iptablesLinkIPTablesBaseChain(virBufferPtr buf, + const char *udchain, + const char *syschain, + unsigned int pos) { virBufferAsprintf(buf, "res=$($IPT -L %s -n --line-number | %s '%s')\n" @@ -615,11 +616,11 @@ static int iptablesLinkIPTablesBaseChain(virBufferPtr buf, syschain, CMD_STOPONERR(true)); - return 0; } -static int iptablesCreateBaseChains(virBufferPtr buf) +static void +iptablesCreateBaseChains(virBufferPtr buf) { virBufferAddLit(buf, "$IPT -N " VIRT_IN_CHAIN CMD_SEPARATOR "$IPT -N " VIRT_OUT_CHAIN CMD_SEPARATOR @@ -633,12 +634,10 @@ static int iptablesCreateBaseChains(virBufferPtr buf) VIRT_IN_POST_CHAIN, "FORWARD", 3); iptablesLinkIPTablesBaseChain(buf, HOST_IN_CHAIN, "INPUT", 1); - - return 0; } -static int +static void iptablesCreateTmpRootChain(virBufferPtr buf, char prefix, bool incoming, const char *ifname) @@ -658,23 +657,20 @@ iptablesCreateTmpRootChain(virBufferPtr buf, "%s", chain, CMD_STOPONERR(true)); - - return 0; } -static int +static void iptablesCreateTmpRootChains(virBufferPtr buf, const char *ifname) { iptablesCreateTmpRootChain(buf, 'F', false, ifname); iptablesCreateTmpRootChain(buf, 'F', true, ifname); iptablesCreateTmpRootChain(buf, 'H', true, ifname); - return 0; } -static int +static void _iptablesRemoveRootChain(virBufferPtr buf, char prefix, bool incoming, const char *ifname, @@ -699,55 +695,51 @@ _iptablesRemoveRootChain(virBufferPtr buf, "$IPT -X %s" CMD_SEPARATOR, chain, chain); - - return 0; } -static int +static void iptablesRemoveRootChain(virBufferPtr buf, char prefix, bool incoming, const char *ifname) { - return _iptablesRemoveRootChain(buf, prefix, incoming, ifname, 0); + _iptablesRemoveRootChain(buf, prefix, incoming, ifname, 0); } -static int +static void iptablesRemoveTmpRootChain(virBufferPtr buf, char prefix, bool incoming, const char *ifname) { - return _iptablesRemoveRootChain(buf, prefix, - incoming, ifname, 1); + _iptablesRemoveRootChain(buf, prefix, + incoming, ifname, 1); } -static int +static void iptablesRemoveTmpRootChains(virBufferPtr buf, const char *ifname) { iptablesRemoveTmpRootChain(buf, 'F', false, ifname); iptablesRemoveTmpRootChain(buf, 'F', true, ifname); iptablesRemoveTmpRootChain(buf, 'H', true, ifname); - return 0; } -static int +static void iptablesRemoveRootChains(virBufferPtr buf, const char *ifname) { iptablesRemoveRootChain(buf, 'F', false, ifname); iptablesRemoveRootChain(buf, 'F', true, ifname); iptablesRemoveRootChain(buf, 'H', true, ifname); - return 0; } -static int +static void iptablesLinkTmpRootChain(virBufferPtr buf, const char *basechain, char prefix, @@ -773,24 +765,20 @@ iptablesLinkTmpRootChain(virBufferPtr buf, match, ifname, chain, CMD_STOPONERR(true)); - - return 0; } -static int +static void iptablesLinkTmpRootChains(virBufferPtr buf, const char *ifname) { iptablesLinkTmpRootChain(buf, VIRT_OUT_CHAIN, 'F', false, ifname); iptablesLinkTmpRootChain(buf, VIRT_IN_CHAIN, 'F', true, ifname); iptablesLinkTmpRootChain(buf, HOST_IN_CHAIN, 'H', true, ifname); - - return 0; } -static int +static void iptablesSetupVirtInPost(virBufferPtr buf, const char *ifname) { @@ -808,11 +796,10 @@ iptablesSetupVirtInPost(virBufferPtr buf, PHYSDEV_IN, ifname, match, ifname, CMD_STOPONERR(1)); - return 0; } -static int +static void iptablesClearVirtInPost(virBufferPtr buf, const char *ifname) { @@ -821,10 +808,9 @@ iptablesClearVirtInPost(virBufferPtr buf, "$IPT -D " VIRT_IN_POST_CHAIN " %s %s -j ACCEPT" CMD_SEPARATOR, match, ifname); - return 0; } -static int +static void _iptablesUnlinkRootChain(virBufferPtr buf, const char *basechain, char prefix, @@ -865,57 +851,52 @@ _iptablesUnlinkRootChain(virBufferPtr buf, "%s %s -g %s" CMD_SEPARATOR, basechain, old_match, ifname, chain); - - return 0; } -static int +static void iptablesUnlinkRootChain(virBufferPtr buf, const char *basechain, char prefix, bool incoming, const char *ifname) { - return _iptablesUnlinkRootChain(buf, - basechain, prefix, incoming, ifname, 0); + _iptablesUnlinkRootChain(buf, + basechain, prefix, incoming, ifname, 0); } -static int +static void iptablesUnlinkTmpRootChain(virBufferPtr buf, const char *basechain, char prefix, bool incoming, const char *ifname) { - return _iptablesUnlinkRootChain(buf, - basechain, prefix, incoming, ifname, 1); + _iptablesUnlinkRootChain(buf, + basechain, prefix, incoming, ifname, 1); } -static int +static void iptablesUnlinkRootChains(virBufferPtr buf, const char *ifname) { iptablesUnlinkRootChain(buf, VIRT_OUT_CHAIN, 'F', false, ifname); iptablesUnlinkRootChain(buf, VIRT_IN_CHAIN, 'F', true, ifname); iptablesUnlinkRootChain(buf, HOST_IN_CHAIN, 'H', true, ifname); - - return 0; } -static int +static void iptablesUnlinkTmpRootChains(virBufferPtr buf, const char *ifname) { iptablesUnlinkTmpRootChain(buf, VIRT_OUT_CHAIN, 'F', false, ifname); iptablesUnlinkTmpRootChain(buf, VIRT_IN_CHAIN, 'F', true, ifname); iptablesUnlinkTmpRootChain(buf, HOST_IN_CHAIN, 'H', true, ifname); - return 0; } -static int +static void iptablesRenameTmpRootChain(virBufferPtr buf, char prefix, bool incoming, @@ -940,18 +921,16 @@ iptablesRenameTmpRootChain(virBufferPtr buf, "$IPT -E %s %s" CMD_SEPARATOR, tmpchain, chain); - return 0; } -static int +static void iptablesRenameTmpRootChains(virBufferPtr buf, const char *ifname) { iptablesRenameTmpRootChain(buf, 'F', false, ifname); iptablesRenameTmpRootChain(buf, 'F', true, ifname); iptablesRenameTmpRootChain(buf, 'H', true, ifname); - return 0; } @@ -2863,7 +2842,7 @@ ebiptablesExecCLI(virBufferPtr buf, bool ignoreNonzero, char **outbuf) } -static int +static void ebtablesCreateTmpRootChain(virBufferPtr buf, bool incoming, const char *ifname) { @@ -2880,11 +2859,10 @@ ebtablesCreateTmpRootChain(virBufferPtr buf, chain, CMD_STOPONERR(true)); - return 0; } -static int +static void ebtablesLinkTmpRootChain(virBufferPtr buf, bool incoming, const char *ifname) { @@ -2904,12 +2882,10 @@ ebtablesLinkTmpRootChain(virBufferPtr buf, iodev, ifname, chain, CMD_STOPONERR(true)); - - return 0; } -static int +static void _ebtablesRemoveRootChain(virBufferPtr buf, bool incoming, const char *ifname, int isTempChain) @@ -2930,28 +2906,26 @@ _ebtablesRemoveRootChain(virBufferPtr buf, "$EBT -t nat -X %s" CMD_SEPARATOR, chain, chain); - - return 0; } -static int +static void ebtablesRemoveRootChain(virBufferPtr buf, bool incoming, const char *ifname) { - return _ebtablesRemoveRootChain(buf, incoming, ifname, 0); + _ebtablesRemoveRootChain(buf, incoming, ifname, 0); } -static int +static void ebtablesRemoveTmpRootChain(virBufferPtr buf, bool incoming, const char *ifname) { - return _ebtablesRemoveRootChain(buf, incoming, ifname, 1); + _ebtablesRemoveRootChain(buf, incoming, ifname, 1); } -static int +static void _ebtablesUnlinkRootChain(virBufferPtr buf, bool incoming, const char *ifname, int isTempChain) @@ -2975,24 +2949,22 @@ _ebtablesUnlinkRootChain(virBufferPtr buf, incoming ? EBTABLES_CHAIN_INCOMING : EBTABLES_CHAIN_OUTGOING, iodev, ifname, chain); - - return 0; } -static int +static void ebtablesUnlinkRootChain(virBufferPtr buf, bool incoming, const char *ifname) { - return _ebtablesUnlinkRootChain(buf, incoming, ifname, 0); + _ebtablesUnlinkRootChain(buf, incoming, ifname, 0); } -static int +static void ebtablesUnlinkTmpRootChain(virBufferPtr buf, bool incoming, const char *ifname) { - return _ebtablesUnlinkRootChain(buf, incoming, ifname, 1); + _ebtablesUnlinkRootChain(buf, incoming, ifname, 1); } @@ -3077,7 +3049,7 @@ ebtablesCreateTmpSubChain(ebiptablesRuleInstPtr *inst, return 0; } -static int +static void _ebtablesRemoveSubChains(virBufferPtr buf, const char *ifname, const char *chains) @@ -3106,11 +3078,9 @@ _ebtablesRemoveSubChains(virBufferPtr buf, rootchain); } virBufferAddLit(buf, "rm_chains $chains\n"); - - return 0; } -static int +static void ebtablesRemoveSubChains(virBufferPtr buf, const char *ifname) { @@ -3120,10 +3090,10 @@ ebtablesRemoveSubChains(virBufferPtr buf, 0 }; - return _ebtablesRemoveSubChains(buf, ifname, chains); + _ebtablesRemoveSubChains(buf, ifname, chains); } -static int +static void ebtablesRemoveTmpSubChains(virBufferPtr buf, const char *ifname) { @@ -3133,10 +3103,10 @@ ebtablesRemoveTmpSubChains(virBufferPtr buf, 0 }; - return _ebtablesRemoveSubChains(buf, ifname, chains); + _ebtablesRemoveSubChains(buf, ifname, chains); } -static int +static void ebtablesRenameTmpSubChain(virBufferPtr buf, bool incoming, const char *ifname, @@ -3159,18 +3129,17 @@ ebtablesRenameTmpSubChain(virBufferPtr buf, virBufferAsprintf(buf, "$EBT -t nat -E %s %s" CMD_SEPARATOR, tmpchain, chain); - return 0; } -static int +static void ebtablesRenameTmpRootChain(virBufferPtr buf, bool incoming, const char *ifname) { - return ebtablesRenameTmpSubChain(buf, incoming, ifname, NULL); + ebtablesRenameTmpSubChain(buf, incoming, ifname, NULL); } -static int +static void ebtablesRenameTmpSubAndRootChains(virBufferPtr buf, const char *ifname) { @@ -3203,8 +3172,6 @@ ebtablesRenameTmpSubAndRootChains(virBufferPtr buf, ebtablesRenameTmpRootChain(buf, true, ifname); ebtablesRenameTmpRootChain(buf, false, ifname); - - return 0; } static void @@ -3543,16 +3510,18 @@ tear_down_tmpebchains: static int ebtablesRemoveBasicRules(const char *ifname) { - return ebtablesCleanAll(ifname); + ebtablesCleanAll(ifname); + return 0; } -static int ebtablesCleanAll(const char *ifname) +static void +ebtablesCleanAll(const char *ifname) { virBuffer buf = VIR_BUFFER_INITIALIZER; if (!ebtables_cmd_path) - return 0; + return; NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -3569,7 +3538,6 @@ static int ebtablesCleanAll(const char *ifname) ebtablesRemoveTmpRootChain(&buf, false, ifname); ebiptablesExecCLI(&buf, true, NULL); - return 0; } @@ -3685,8 +3653,7 @@ ebtablesCreateTmpRootAndSubChains(virBufferPtr buf, virHashKeyValuePairPtr filter_names; const virNWFilterChainPriority *priority; - if (ebtablesCreateTmpRootChain(buf, incoming, ifname) < 0) - return -1; + ebtablesCreateTmpRootChain(buf, incoming, ifname); filter_names = virHashGetItems(chains, ebiptablesFilterOrderSort); @@ -4246,7 +4213,7 @@ err_exit: return ret; } -static int +static void ebiptablesDriverInitCLITools(void) { ebtables_cmd_path = virFindFileInPath("ebtables"); @@ -4260,8 +4227,6 @@ ebiptablesDriverInitCLITools(void) ip6tables_cmd_path = virFindFileInPath("ip6tables"); if (!ip6tables_cmd_path) VIR_WARN("Could not find 'ip6tables' executable"); - - return 0; } /* -- 1.8.5.3