diff options
| -rw-r--r-- | iptables/ip6tables.c | 14 | ||||
| -rw-r--r-- | iptables/iptables-xml.c | 18 | ||||
| -rw-r--r-- | iptables/iptables.c | 14 | ||||
| -rw-r--r-- | iptables/iptables.xslt | 2 | ||||
| -rw-r--r-- | libiptc/libiptc.c | 2 | ||||
| -rw-r--r-- | libxtables/xtables.c | 2 |
6 files changed, 29 insertions, 23 deletions
diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c index 8db13b45..2731209e 100644 --- a/iptables/ip6tables.c +++ b/iptables/ip6tables.c @@ -1046,7 +1046,7 @@ static int print_match_save(const struct xt_entry_match *e, return 0; } -/* print a given ip including mask if neccessary */ +/* Print a given ip including mask if necessary. */ static void print_ip(const char *prefix, const struct in6_addr *ip, const struct in6_addr *mask, int invert) { @@ -1067,8 +1067,9 @@ static void print_ip(const char *prefix, const struct in6_addr *ip, printf("/%d", l); } -/* We want this to be readable, so only print out neccessary fields. - * Because that's the kind of world I want to live in. */ +/* We want this to be readable, so only print out necessary fields. + * Because that's the kind of world I want to live in. + */ void print_rule6(const struct ip6t_entry *e, struct xtc_handle *h, const char *chain, int counters) { @@ -1840,10 +1841,11 @@ int do_command6(int argc, char *argv[], char **table, } if (!cs.target) { - /* it is no chain, and we can't load a plugin. + /* It is no chain, and we can't load a plugin. * We cannot know if the plugin is corrupt, non - * existant OR if the user just misspelled a - * chain. */ + * existent OR if the user just misspelled a + * chain. + */ #ifdef IP6T_F_GOTO if (cs.fw6.ipv6.flags & IP6T_F_GOTO) xtables_error(PARAMETER_PROBLEM, diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c index 74614127..740a563c 100644 --- a/iptables/iptables-xml.c +++ b/iptables/iptables-xml.c @@ -131,8 +131,9 @@ free_argv(void) oldargc = 0; } -/* save parsed rule for comparison with next rule - to perform action agregation on duplicate conditions */ +/* Save parsed rule for comparison with next rule to perform action aggregation + * on duplicate conditions. + */ static void save_argv(void) { @@ -527,12 +528,13 @@ do_rule_part(char *leveltag1, char *leveltag2, int part, int argc, static int compareRules(void) { - /* compare arguments up to -j or -g for match. - NOTE: We don't want to combine actions if there were no criteria - in each rule, or rules didn't have an action - NOTE: Depends on arguments being in some kind of "normal" order which - is the case when processing the ACTUAL output of actual iptables-save - rather than a file merely in a compatable format */ + /* Compare arguments up to -j or -g for match. + * NOTE: We don't want to combine actions if there were no criteria + * in each rule, or rules didn't have an action. + * NOTE: Depends on arguments being in some kind of "normal" order which + * is the case when processing the ACTUAL output of actual iptables-save + * rather than a file merely in a compatible format. + */ unsigned int old = 0; unsigned int new = 0; diff --git a/iptables/iptables.c b/iptables/iptables.c index 88953c47..91617c24 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -1037,7 +1037,7 @@ static int print_match_save(const struct xt_entry_match *e, return 0; } -/* print a given ip including mask if neccessary */ +/* Print a given ip including mask if necessary. */ static void print_ip(const char *prefix, uint32_t ip, uint32_t mask, int invert) { @@ -1067,8 +1067,9 @@ static void print_ip(const char *prefix, uint32_t ip, printf("/%u.%u.%u.%u", IP_PARTS(mask)); } -/* We want this to be readable, so only print out neccessary fields. - * Because that's the kind of world I want to live in. */ +/* We want this to be readable, so only print out necessary fields. + * Because that's the kind of world I want to live in. + */ void print_rule4(const struct ipt_entry *e, struct xtc_handle *h, const char *chain, int counters) { @@ -1838,10 +1839,11 @@ int do_command4(int argc, char *argv[], char **table, } if (!cs.target) { - /* it is no chain, and we can't load a plugin. + /* It is no chain, and we can't load a plugin. * We cannot know if the plugin is corrupt, non - * existant OR if the user just misspelled a - * chain. */ + * existent OR if the user just misspelled a + * chain. + */ #ifdef IPT_F_GOTO if (cs.fw.ip.flags & IPT_F_GOTO) xtables_error(PARAMETER_PROBLEM, diff --git a/iptables/iptables.xslt b/iptables/iptables.xslt index d6a432cf..afe6d0d0 100644 --- a/iptables/iptables.xslt +++ b/iptables/iptables.xslt @@ -13,7 +13,7 @@ <!-- output conditions of a rule but not an action --> <xsl:template match="iptables-rules/table/chain/rule/conditions/*"> - <!-- <match> is the psuedo module when a match module doesn't need to be loaded + <!-- <match> is the pseudo module when a match module doesn't need to be loaded and when -m does not need to be inserted --> <xsl:if test="name() != 'match'"> <xsl:text> -m </xsl:text><xsl:value-of select="name()"/> diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c index 9c07bb40..2c66d041 100644 --- a/libiptc/libiptc.c +++ b/libiptc/libiptc.c @@ -592,7 +592,7 @@ static int iptcc_chain_index_rebuild(struct xtc_handle *h) * There are different strategies, the simple and safe is to rebuild * the chain index every time. The more advanced is to update the * array index to point to the next element, but that requires some - * house keeping and boundry checks. The advanced is implemented, as + * house keeping and boundary checks. The advanced is implemented, as * the simple approach behaves badly when all chains are deleted * because list_for_each processing will always hit the first chain * index, thus causing a rebuild for every chain. diff --git a/libxtables/xtables.c b/libxtables/xtables.c index 5357d12c..f14d503c 100644 --- a/libxtables/xtables.c +++ b/libxtables/xtables.c @@ -1137,7 +1137,7 @@ void xtables_rule_matches_free(struct xtables_rule_match **matches) * * %XTF_BAD_VALUE: bad value for option * @p1: module name - * @p2: option with which the problem occured (e.g. "--mark") + * @p2: option with which the problem occurred (e.g. "--mark") * @p3: string the user passed in (e.g. "99999999999999") * * %XTF_ONE_ACTION: two mutually exclusive actions have been specified |