iptables: Spelling fixes

While at it, update comment format for the respective blocks.

Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
index 8db13b45e7c5d219471fba37d5cdb51e77ef038f..2731209e5df97cf586d46ace3f9636549756fa88 100644 (file)
--- 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 746141273f1afcf7d0ebe3902697804fc787b0c6..740a563c8e639a5c715ef229c154532251c2198f 100644 (file)
--- 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 88953c476a89e117cfec1b480ad1f51409b583c4..91617c24c32c3082f9e01b0cd260f68cbeab17b7 100644 (file)
--- 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 d6a432cfd56c8f36d34efa29455610d09010a63e..afe6d0d08ee0be6cc4f8bd428d153268560146c6 100644 (file)
--- 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 9c07bb402bc52ab8276d3814c6c258a4a15e7de0..2c66d041300c779950fcf2874ee7641dd330e304 100644 (file)
--- 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 5357d12c748114806bbbe3c5ff6077dcb4e6d283..f14d503c0b3e863667fd215569da357085f2ceff 100644 (file)
--- 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