Fix some spelling. [skip ci]

diff --git a/CHANGES b/CHANGES
index 329d5f07cf714d6dc72cdf2a60246033cea6b889..7bfbd5f8b9e0933558351e7789442099cd784b3e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -360,7 +360,7 @@ Wednesday Jul. 2, 2014 [email protected]
         a number of unaligned access faults fixed
         -A flag does not consider CR to be printable anymore
         fx.lebail took over coverity baby sitting
-        default snapshot size increased to 256K for accomodate USB captures
+        default snapshot size increased to 256K for accommodate USB captures
         WARNING: this release contains a lot of very worthwhile code churn.
 
 Wednesday Jan. 15, 2014 [email protected]
@@ -595,7 +595,7 @@ Wed.        July 23, 2007.  [email protected].  Summary for 3.9.7 libpcap release
        NFS: from NetBSD; don't interpret the reply as a possible NFS reply
                if it got MSG_DENIED.
        BGP: don't print TLV values that didn't fit, from www.digit-labs.org.
-       revised INSTALL.txt about libpcap dependancy.
+       revised INSTALL.txt about libpcap dependency.
 
 Wed.   April 25, 2007. [email protected].  Summary for 3.9.6 tcpdump release
        Update man page to reflect changes to libpcap
@@ -860,7 +860,7 @@ Tuesday January 9, 2001. [email protected]. Summary for 3.6 release
 
        libpcap changes provide for exchanging capture files between
          systems. Save files now have well known PACKET_ values instead of
-         depending upon system dependant mappings of DLT_* types.
+         depending upon system dependent mappings of DLT_* types.
 
        Support for computing/checking IP and UDP/TCP checksums.
 
@@ -1336,7 +1336,7 @@ v2.2 Fri May 22 17:19:41 PDT 1992
 
 v2.1 Tue Jan 28 11:00:14 PST 1992
 
-- Internal release (never publically exported).
+- Internal release (never publicly exported).
 
 v2.0.1 Sun Jan 26 21:10:10 PDT
 

diff --git a/ip.h b/ip.h
index b3b23d1a08aa44f010ddf1a58bb1c9d0796328e9..ca87548fd096ca2d31a7534f8c2e72caf8865b90 100644 (file)
--- a/ip.h
+++ b/ip.h
@@ -57,7 +57,7 @@ struct ip {
        nd_uint16_t     ip_len;         /* total length */
        nd_uint16_t     ip_id;          /* identification */
        nd_uint16_t     ip_off;         /* fragment offset field */
-#define        IP_DF 0x4000                    /* dont fragment flag */
+#define        IP_DF 0x4000                    /* don't fragment flag */
 #define        IP_MF 0x2000                    /* more fragments flag */
 #define        IP_OFFMASK 0x1fff               /* mask for fragmenting bits */
        nd_uint8_t      ip_ttl;         /* time to live */

diff --git a/print-802_15_4.c b/print-802_15_4.c
index 717acec84444b5e328994d93a67a848a5ac305ca..521c1cef120c907ef80ac48d704323f760c54e09 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -568,7 +568,7 @@ ieee802_15_4_print_superframe_specification(netdissect_options *ndo,
                 ((ss >> 8) & 0xf));
        if (CHECK_BIT(ss, 12)) { ND_PRINT(", BLE enabled"); }
        if (CHECK_BIT(ss, 14)) { ND_PRINT(", PAN Coordinator"); }
-       if (CHECK_BIT(ss, 15)) { ND_PRINT(", Assocation Permit"); }
+       if (CHECK_BIT(ss, 15)) { ND_PRINT(", Association Permit"); }
 }
 
 /*
@@ -787,7 +787,7 @@ ieee802_15_4_print_header_ie(netdissect_options *ndo,
                                }
                        }
                        if (ie_len < ptr + 8) {
-                               ND_PRINT(" [ERROR: Truncated before Time syncronization specification]");
+                               ND_PRINT(" [ERROR: Truncated before Time synchronization specification]");
                                break;
                        }
                        ND_PRINT("Beacon timestamp = %" PRIu64 ", offset = %d",
@@ -1087,7 +1087,7 @@ ieee802_15_4_print_mlme_ie(netdissect_options *ndo,
                }
 
                break;
-       case 0x1a: /* TSCH Syncronization IE. */
+       case 0x1a: /* TSCH Synchronization IE. */
                if (sub_ie_len < 6) {
                        ND_PRINT("[ERROR: Length != 6]");
                }
@@ -1212,7 +1212,7 @@ ieee802_15_4_print_mlme_ie(netdissect_options *ndo,
                /* XXX Not implemented */
        case 0x2c: /* TVWS Device Capabilities IE */
                /* XXX Not implemented */
-       case 0x2d: /* TVWS Device Catagory IE */
+       case 0x2d: /* TVWS Device Category IE */
                /* XXX Not implemented */
        case 0x2e: /* TVWS Device Identification IE */
                /* XXX Not implemented */
@@ -1609,9 +1609,9 @@ ieee802_15_4_print_command_data(netdissect_options *ndo,
        u_int i;
 
        switch (command_id) {
-       case 0x01: /* Assocation Request */
+       case 0x01: /* Association Request */
                if (caplen != 1) {
-                       ND_PRINT("Invalid Assocation request command length");
+                       ND_PRINT("Invalid Association request command length");
                        return -1;
                } else {
                        uint8_t cap_info;
@@ -1632,9 +1632,9 @@ ieee802_15_4_print_command_data(netdissect_options *ndo,
                        return caplen;
                }
                break;
-       case 0x02: /* Assocation Response */
+       case 0x02: /* Association Response */
                if (caplen != 3) {
-                       ND_PRINT("Invalid Assocation response command length");
+                       ND_PRINT("Invalid Association response command length");
                        return -1;
                } else {
                        ND_PRINT("Short address = ");
@@ -1850,7 +1850,7 @@ ieee802_15_4_std_frames(netdissect_options *ndo,
        if (CHECK_BIT(fc, 8)) {
                /* Sequence number is suppressed. */
                if (frame_version < 2) {
-                       /* Sequence number can only be supressed for frame
+                       /* Sequence number can only be suppressed for frame
                           version 2 or higher, this is invalid frame. */
                        ND_PRINT("[ERROR: Sequence number suppressed on frames where version < 2]");
                }

diff --git a/print-ip6.c b/print-ip6.c
index 672ed10428620299bc170f7cc08434d238d597df..525a284ecdb0c4375631c2c123eb16161d9c3030 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -374,7 +374,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                         * XXX - we don't use "advance"; RFC 3775 says that
                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of
-                        * the possiblity of a future extension in
+                        * the possibility of a future extension in
                         * which payload can be piggybacked atop a
                         * mobility header.
                         */

diff --git a/print-ppp.c b/print-ppp.c
index fe0362473c5acc0b7f467002723c6907e1ebd0a8..72c609a61d796ed8e2b652dd66f1e43a196e4d5c 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -1379,7 +1379,7 @@ ppp_hdlc(netdissect_options *ndo,
 
        /*
         * Unescape all the data into a temporary, private, buffer.
-        * Do this so that we dont overwrite the original packet
+        * Do this so that we don't overwrite the original packet
         * contents.
         */
        for (s = p, t = b, i = caplen; i != 0; i--) {

diff --git a/tests/TESTrun b/tests/TESTrun
index 842a2dfdb307efaaccb9cbbf76a8413e5b47685b..b423627d70fd866a027a3792c6893f594931d225 100755 (executable)
--- a/tests/TESTrun
+++ b/tests/TESTrun
@@ -405,7 +405,7 @@ sub runOneComplexTest {
     #use Data::Dumper;
     #print Dumper($testconfig);
 
-    # EXPAND any occurances of @TESTDIR@ to $testsdir
+    # EXPAND any occurrences of @TESTDIR@ to $testsdir
     $options =~ s/\@TESTDIR\@/$testsdir/;
 
     my $result = runtest($name,