summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2018-02-07 11:34:31 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-02-15 16:51:52 +0100
commit4ff84696af496c398f7621f65858a0120fc2c596 (patch)
tree5b325151efd1a1b9a0dd293e89d6b9abd5b88320
parent25ab0aabf2e23aa1dcde0e0b8175f0d0417ef87e (diff)
src: Spelling fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--INSTALL2
-rw-r--r--doc/nft.xml2
-rw-r--r--include/datatype.h2
-rw-r--r--src/exthdr.c4
-rw-r--r--src/netlink_delinearize.c2
-rw-r--r--src/payload.c4
-rwxr-xr-xtests/py/nft-test.py2
-rw-r--r--tests/shell/README2
-rwxr-xr-xtests/shell/testcases/include/0012glob_dependency_12
-rwxr-xr-xtests/shell/testcases/listing/0002ruleset_02
10 files changed, 12 insertions, 12 deletions
diff --git a/INSTALL b/INSTALL
index e212bacb..5e398857 100644
--- a/INSTALL
+++ b/INSTALL
@@ -43,7 +43,7 @@ Installation instructions for nftables
--datarootdir=
- The base directory for arch-independant files. Defaults to
+ The base directory for arch-independent files. Defaults to
$prefix/share.
--disable-debug
diff --git a/doc/nft.xml b/doc/nft.xml
index d5b9c27c..807c8363 100644
--- a/doc/nft.xml
+++ b/doc/nft.xml
@@ -3568,7 +3568,7 @@ inet filter output rt ip6 nexthop fd00::1
</row>
<row>
<entry>vtag</entry>
- <entry>Verfication Tag</entry>
+ <entry>Verification Tag</entry>
<entry>integer (32 bit)</entry>
</row>
<row>
diff --git a/include/datatype.h b/include/datatype.h
index e9f60798..cc4cb078 100644
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -129,7 +129,7 @@ enum datatype_flags {
* @subtypes: number of subtypes (concat type)
* @name: type name
* @desc: type description
- * @basetype: basetype for subtypes, determines type compatibilty
+ * @basetype: basetype for subtypes, determines type compatibility
* @basefmt: format string for basetype
* @print: function to print a constant of this type
* @parse: function to parse a symbol and return an expression
diff --git a/src/exthdr.c b/src/exthdr.c
index ac3e1632..f5c20ac2 100644
--- a/src/exthdr.c
+++ b/src/exthdr.c
@@ -26,8 +26,8 @@
static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)
{
if (expr->exthdr.op == NFT_EXTHDR_OP_TCPOPT) {
- /* Offset calcualtion is a bit hacky at this point.
- * There might be an tcp option one day with another
+ /* Offset calculation is a bit hacky at this point.
+ * There might be a tcp option one day with another
* multiplicator
*/
unsigned int offset = expr->exthdr.offset / 64;
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 82eefa61..622425ee 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -2247,7 +2247,7 @@ static void stmt_payload_postprocess(struct rule_pp_ctx *ctx)
/*
* We can only remove payload dependencies if they occur without
- * a statment with side effects in between.
+ * a statement with side effects in between.
*
* For instance:
* 'ip protocol tcp tcp dport 22 counter' is same as
diff --git a/src/payload.c b/src/payload.c
index 15d055b6..6e762ff3 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -482,13 +482,13 @@ static bool payload_may_dependency_kill(struct payload_dep_ctx *ctx,
}
/**
- * payload_dependency_kill - kill a redundant payload depedency
+ * payload_dependency_kill - kill a redundant payload dependency
*
* @ctx: payload dependency context
* @expr: higher layer payload expression
*
* Kill a redundant payload expression if a higher layer payload expression
- * implies its existance. Skip this if the dependency is a network payload and
+ * implies its existence. Skip this if the dependency is a network payload and
* we are in bridge, netdev and inet families.
*/
void payload_dependency_kill(struct payload_dep_ctx *ctx, struct expr *expr,
diff --git a/tests/py/nft-test.py b/tests/py/nft-test.py
index 6aedfb09..87e3d51e 100755
--- a/tests/py/nft-test.py
+++ b/tests/py/nft-test.py
@@ -384,7 +384,7 @@ def set_add_elements(set_element, set_name, state, filename, lineno):
print_error(reason, filename, lineno)
return -1
- # Add element into a all_set.
+ # Add element into all_set.
if ret == 0 and state == "ok":
for e in set_element:
all_set[set_name].add(e)
diff --git a/tests/shell/README b/tests/shell/README
index 2d8681fd..3ffe642c 100644
--- a/tests/shell/README
+++ b/tests/shell/README
@@ -10,7 +10,7 @@ To run the test suite (as root):
Test files are executables files with the pattern <<name_N>>, where N is the
expected return code of the executable. Since they are located with `find',
-test-files can be spreaded in any sub-directories.
+test-files can be spread in any sub-directories.
You can turn on a verbose execution by calling:
% ./run-tests.sh -v
diff --git a/tests/shell/testcases/include/0012glob_dependency_1 b/tests/shell/testcases/include/0012glob_dependency_1
index 740f5ea1..6cf4ba17 100755
--- a/tests/shell/testcases/include/0012glob_dependency_1
+++ b/tests/shell/testcases/include/0012glob_dependency_1
@@ -38,7 +38,7 @@ RULESET1="add table x"
RULESET2="add chain x y"
RULESET3="include \"$tmpdir/*\""
-# Note different order when compared with 0011dir_depencency_0. The idea
+# Note different order when compared with 0011dir_dependency_0. The idea
# here is to introduce wrong order to get the loading fail.
echo "$RULESET1" > $tmpfile2
echo "$RULESET2" > $tmpfile1
diff --git a/tests/shell/testcases/listing/0002ruleset_0 b/tests/shell/testcases/listing/0002ruleset_0
index 916034ff..45121fb7 100755
--- a/tests/shell/testcases/listing/0002ruleset_0
+++ b/tests/shell/testcases/listing/0002ruleset_0
@@ -1,6 +1,6 @@
#!/bin/bash
-# list ruleset show nothing if emtpy ruleset
+# list ruleset show nothing if empty ruleset
EXPECTED=""