From 69e1aa860bf4230be6576f8367db2c8595b4e7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=94=D0=BE=D0=BD=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=BE?= <dpb@corrigendum.ru>
Date: Sun, 11 Oct 2020 02:42:05 +0300
Subject: [PATCH] Fix many spelling errors

---
 wiretap/README.airmagnet       |  4 ++--
 wiretap/ascend.y               |  2 +-
 wiretap/dbs-etherwatch.c       | 12 ++++++------
 wiretap/erf.c                  |  8 ++++----
 wiretap/file_wrappers.c        |  2 +-
 wiretap/ipfix.c                |  2 +-
 wiretap/iseries.c              |  8 ++++----
 wiretap/merge.c                |  2 +-
 wiretap/netmon.c               |  4 ++--
 wiretap/netscaler.c            |  2 +-
 wiretap/nettrace_3gpp_32_423.c | 10 +++++-----
 wiretap/ngsniffer.c            |  2 +-
 wiretap/pcap-common.c          |  2 +-
 wiretap/peekclassic.c          |  2 +-
 wiretap/peektagged.c           |  2 +-
 wiretap/rfc7468.c              |  2 +-
 wiretap/snoop.c                |  2 +-
 wiretap/visual.c               |  2 +-
 wiretap/vms.c                  |  2 +-
 wiretap/vwr.c                  | 12 ++++++------
 wiretap/wtap.h                 |  8 ++++----
 wiretap/wtap_opttypes.h        |  4 ++--
 wsutil/filesystem.c            |  2 +-
 wsutil/filesystem.h            |  2 +-
 wsutil/nstime.c                |  2 +-
 wsutil/rsa.c                   |  2 +-
 wsutil/strptime.c              |  2 +-
 wsutil/win32-utils.c           |  2 +-
 wsutil/ws_cpuid.h              |  2 +-
 wsutil/ws_mempbrk_sse42.c      |  2 +-
 30 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/wiretap/README.airmagnet b/wiretap/README.airmagnet
index 36e1d2ea17..084ad24f79 100644
--- a/wiretap/README.airmagnet
+++ b/wiretap/README.airmagnet
@@ -3,11 +3,11 @@ AMC: Wireless Analyzer Captured Data (AirMagnet)
 This is just a braindump from looking at some Airmagnet capture files,
 in one case having a look at a decoded display in Airmagnet itself.
 Lots of things are still unknown.
-This is NOT the intention to write a file importer in the forseeable
+This is NOT the intention to write a file importer in the foreseeable
 future.
 
 Exact timestamp decoding still unknown:
-From a diffrent decoded examplefile:
+From a different decoded example file:
 06 51 49 1b     Timestamp  (105990427)  =  03:30:27.497544
 06 51 4a cd     Timestamp  (105990861)  =  03:30:27.497978  (+434)
 06 51 4b ce     Timestamp  (105991118)  =  03:30:27.498235  (+257)
diff --git a/wiretap/ascend.y b/wiretap/ascend.y
index bfaadf4016..b19a0464b0 100644
--- a/wiretap/ascend.y
+++ b/wiretap/ascend.y
@@ -136,7 +136,7 @@ XMIT-Max7:20: (task "_brouterControlTask" at 0xb094ac20, time: 1481.51) 20 octet
     1) White space is added before "(task".
     2) Task has a name, indicated by a subsequent string surrounded by a
        double-quote.
-    3) Address expressed in hex number has a preceeding "0x".
+    3) Address expressed in hex number has a preceding "0x".
     4) Hex numbers are in lower case.
     5) There is a character display corresponding to hex data in each line.
 
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index 8e10cba7cc..84d49f44a9 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -78,7 +78,7 @@ static gboolean parse_dbs_etherwatch_packet(FILE_T fh, wtap_rec *rec,
     Buffer* buf, int *err, gchar **err_info);
 static guint parse_single_hex_dump_line(char* rec, guint8 *buf,
     int byte_offset);
-static guint parse_hex_dump(char* dump, guint8 *buf, char seperator, char end);
+static guint parse_hex_dump(char* dump, guint8 *buf, char separator, char end);
 
 /* Seeks to the beginning of the next packet, and returns the
    byte offset.  Returns -1 on failure, and sets "*err" to the error
@@ -237,7 +237,7 @@ Protocol 08-00 00 00-00-00-00-00,   50 byte buffer at 10-OCT-2001 10:20:45.17
 #define PID_LENGTH          5           /* Length PID */
 #define PID_POS             18          /* Position PID */
 #define LENGTH_POS          33          /* Position length */
-#define HEX_HDR_SPR         '-'         /* Seperator char header hex values */
+#define HEX_HDR_SPR         '-'         /* Separator char header hex values */
 #define HEX_HDR_END         ' '         /* End char hdr. hex val. except PID */
 #define HEX_PID_END         ','         /* End char PID hex value */
 #define IEEE802_LEN_LEN     2           /* Length of the IEEE 802 len. field */
@@ -518,7 +518,7 @@ parse_dbs_etherwatch_packet(FILE_T fh, wtap_rec *rec, Buffer* buf,
 #define COUNT_POS_HEX       1   /* Count position HEX type */
 #define COUNT_SIZE      5   /* Length counter */
 #define HEX_DUMP_START      '[' /* Start char */
-#define HEX_DUMP_SPR        ' ' /* Seperator char */
+#define HEX_DUMP_SPR        ' ' /* Separator char */
 #define HEX_DUMP_END        ']' /* End char */
 
 /* Take a string representing one line from a hex dump and converts the
@@ -592,7 +592,7 @@ parse_single_hex_dump_line(char* rec, guint8 *buf, int byte_offset) {
 
 /* Parse a hex dump */
 static guint
-parse_hex_dump(char* dump, guint8 *buf, char seperator, char end) {
+parse_hex_dump(char* dump, guint8 *buf, char separator, char end) {
     int     pos, count;
 
     /* Parse the hex dump */
@@ -618,8 +618,8 @@ parse_hex_dump(char* dump, guint8 *buf, char seperator, char end) {
         }
         pos++;
         count++;
-        /* Skip the seperator characters */
-        while(dump[pos] == seperator) {
+        /* Skip the separator characters */
+        while(dump[pos] == separator) {
             pos++;
         }
     }
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 97658bf44a..f32e15b320 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -1612,8 +1612,8 @@ static gboolean erf_write_anchor_meta_update_phdr(wtap_dumper *wdh, erf_dump_t *
    * implicit Host ID. */
 
   /* 2. AnchorID exthdr with 'unique' per-host Anchor ID assigned by this host
-   * (in this case Wireshark). Anchor defintion flag set to 1 to indicate this
-   * record contains a defintion of the ID, in this case a comment on a single
+   * (in this case Wireshark). Anchor definition flag set to 1 to indicate this
+   * record contains a definition of the ID, in this case a comment on a single
    * packet. Tied to above extension header by ordering like a list */
   erf_append_ext_hdr_to_list(anchor_id_hdr | ERF_EHDR_ANCHOR_ID_DEFINITION_MASK, meta_ehdrs);
 
@@ -1913,7 +1913,7 @@ static gboolean erf_dump(
   } else { /* don't want to insert a new metadata record while looking at another */
     if (dump_priv->prev_erf_type == ERF_TYPE_META && dump_priv->last_meta_periodic) {
       /* Last frame was a periodic (non-comment) metadata record (and this frame is not), check if we
-       * need to insert one to update metdata. */
+       * need to insert one to update metadata. */
 
       if(dump_priv->write_next_extra_meta) {
         if (!dump_priv->periodic_sections) {
@@ -2192,7 +2192,7 @@ static int erf_update_anchors_from_header(erf_t *erf_priv, wtap_rec *rec, union
         anchor_id_current = hdr & ERF_EHDR_ANCHOR_ID_MASK;
         if (!(ERF_ANCHOR_ID_IS_DEFINITION(hdr))) {
           /*
-            * Anchor definiton flag is 0, attempt to associate a comment with this record
+            * Anchor definition flag is 0, attempt to associate a comment with this record
             * XXX: currently the comment count may be wrong on the first pass!
             */
           /* We may not have found the implicit Host ID yet, if so we are unlikely to find anything */
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 478269baf1..748c1db83a 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -794,7 +794,7 @@ gz_head(FILE_T state)
              *
              *    2) we only read the first byte into the buffer with
              *    the first ws_read (e.g., because we're reading from
-             *    a pipe and only the first byte had been writen to
+             *    a pipe and only the first byte had been written to
              *    the pipe at that point), and read the second byte
              *    into the buffer after the first byte in the
              *    fill_in_buffer call, so we now have two bytes in
diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c
index 740d28b151..5f076698b4 100644
--- a/wiretap/ipfix.c
+++ b/wiretap/ipfix.c
@@ -104,7 +104,7 @@ ipfix_read_message_header(ipfix_message_header_t *pfx_hdr, FILE_T fh, int *err,
     if (!wtap_read_bytes_or_eof(fh, pfx_hdr, IPFIX_MSG_HDR_SIZE, err, err_info))
         return FALSE;
 
-    /* fix endianess, because IPFIX files are always big-endian */
+    /* fix endianness, because IPFIX files are always big-endian */
     pfx_hdr->version = g_ntohs(pfx_hdr->version);
     pfx_hdr->message_length = g_ntohs(pfx_hdr->message_length);
     pfx_hdr->export_time_secs = g_ntohl(pfx_hdr->export_time_secs);
diff --git a/wiretap/iseries.c b/wiretap/iseries.c
index abac53aaef..1e43645a29 100644
--- a/wiretap/iseries.c
+++ b/wiretap/iseries.c
@@ -20,7 +20,7 @@
  * 1. Object protocol = ETHERNET (Default)
  * 2. ASCII or Unicode file formats.
  *
- * The above can be acheived by passing option ASCII(*YES) with the trace command
+ * The above can be achieved by passing option ASCII(*YES) with the trace command
  *
  */
 
@@ -58,7 +58,7 @@
  * identifying the packet number, direction, size, timestamp,
  * source/destination MAC addresses and packet type.
  *
- * Thereafter there will be a formated display of the headers above
+ * Thereafter there will be a formatted display of the headers above
  * the link layer, such as ARP, IP, TCP, UDP, and ICMP (all but
  * ICMP have either been seen in captures or on pages such as the ones
  * at
@@ -76,7 +76,7 @@
  * "TCP Header :", "UDP Header :", and (presumably) "ICMP Header:".
  *
  * If the packet contains data this is displayed as 4 groups of 16 hex digits
- * followed by an ASCII representaion of the data line.
+ * followed by an ASCII representation of the data line.
  *
  * Information from the packet header line, higher-level headers and, if
  * available, data lines are extracted by the module for displaying.
@@ -320,7 +320,7 @@ iseries_open (wtap * wth, int *err, gchar ** err_info)
 /*
  * Do some basic sanity checking to ensure we can handle the
  * contents of this trace by checking the header page for
- * requisit requirements and additional information.
+ * requisite requirements and additional information.
  */
 static gboolean
 iseries_check_file_type (wtap * wth, int *err, gchar **err_info, int format)
diff --git a/wiretap/merge.c b/wiretap/merge.c
index 6b6a477631..51d15a5bb9 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -798,7 +798,7 @@ generate_merged_idbs(merge_in_file_t *in_files, const guint in_file_count, const
                     merge_debug("merge::generate_merged_idbs: mode NONE set or did not find a duplicate");
                     /*
                      * This IDB does not match a previous (or we want to save all IDBs),
-                     * so add the IDB to the merge file, and add a map of the indeces.
+                     * so add the IDB to the merge file, and add a map of the indices.
                      */
                     merged_index = add_idb_to_merged_file(merged_idb_list, input_file_idb);
                     add_idb_index_map(&in_files[i], itf_count, merged_index);
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 17285a5b43..1c45864769 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -470,7 +470,7 @@ wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info)
 	wth->subtype_close = netmon_close;
 
 	/* NetMon capture file formats v2.1+ use per-packet encapsulation types.  NetMon 3 sets the value in
-	 * the header to 1 (Ethernet) for backwards compability. */
+	 * the header to 1 (Ethernet) for backwards compatibility. */
 	if((hdr.ver_major == 2 && hdr.ver_minor >= 1) || hdr.ver_major > 2)
 		wth->file_encap = WTAP_ENCAP_PER_PACKET;
 	else
@@ -1209,7 +1209,7 @@ netmon_process_record(wtap *wth, FILE_T fh, wtap_rec *rec,
 	    netmon->version_major > 2) {
 		if (netmon->version_major > 2) {
 			/*
-			 * Asssume 2.3 format, for now.
+			 * Assume 2.3 format, for now.
 			 */
 			trlr_size = (int)sizeof (struct netmonrec_2_3_trlr);
 		} else {
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index 793118a3e3..dc618b5167 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -66,7 +66,7 @@
 
 
 /* The high resolution relative time format.
-** The MS 2 bits of the high resoltion time is defined as follows:
+** The MS 2 bits of the high resolution time is defined as follows:
 ** 00 : time value is in seconds
 ** 01 : time value is in milliseconds
 ** 10 : time value is in microseconds
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index 16105f8415..b6efa44703 100644
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -810,7 +810,7 @@ nettrace_parse_address(char* curr_pos, char* next_pos, gboolean is_src_addr/*SRC
 }
 
 /*
- * Opens an .xml file with Trace data formated according to 3GPP TS 32.423 and converts it to
+ * Opens an .xml file with Trace data formatted according to 3GPP TS 32.423 and converts it to
  * an "Exported PDU type file with the entire xml file as the first "packet" appending the
  * raw messages as subsequent packages to be dissected by wireshark.
  */
@@ -1021,7 +1021,7 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
 		char *raw_msg_pos;
 		char* start_msg_tag_cont;
 
-		/* Clear for each itteration */
+		/* Clear for each iteration */
 		exported_pdu_info.precense_flags = 0;
 		exported_pdu_info.ptype = OLD_PT_NONE;
 
@@ -1067,7 +1067,7 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
 		 */
 		ms = 0;
 		curr_pos = strstr(start_msg_tag_cont, "changeTime");
-		/* Check if we have the tag or if we pased the end of the current message */
+		/* Check if we have the tag or if we passed the end of the current message */
 		if ((curr_pos) && (curr_pos < next_msg_pos)) {
 			curr_pos = curr_pos + 12;
 			scan_found = sscanf(curr_pos, "%u.%u", &second, &ms);
@@ -1105,7 +1105,7 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
 		*  It might contain an address
 		*/
 		curr_pos = strstr(start_msg_tag_cont, "<initiator");
-		/* Check if we have the tag or if we pased the end of the current message */
+		/* Check if we have the tag or if we passed the end of the current message */
 		if ((curr_pos) && (curr_pos < next_msg_pos)) {
 			curr_pos = curr_pos + 10;
 			next_pos = strstr(curr_pos, "</initiator>");
@@ -1121,7 +1121,7 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
 		*  It might contain an address
 		*/
 		curr_pos = strstr(start_msg_tag_cont, "<target");
-		/* Check if we have the tag or if we pased the end of the current message */
+		/* Check if we have the tag or if we passed the end of the current message */
 		if ((curr_pos) && (curr_pos < next_msg_pos)) {
 			curr_pos = curr_pos + 7;
 			next_pos = strstr(curr_pos, "</target>");
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index ab64d0a63d..f53815314f 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -300,7 +300,7 @@ typedef struct _ATMSaveInfo {
  *
  * For AAL types other than AAL5, the packet data is presumably for a
  * single cell, not a reassembled frame, as the ATM Sniffer manual says
- * it dosn't reassemble cells other than AAL5 cells.
+ * it doesn't reassemble cells other than AAL5 cells.
  */
 #define	ATT_AALTYPE		0x0F	/* AAL type: */
 #define	ATT_AAL_UNKNOWN		0x00	/* Unknown AAL */
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 40a408cdc6..e7e367f343 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -563,7 +563,7 @@ static const struct {
 	 * We treat 13 as WTAP_ENCAP_ENC on all systems except those
 	 * that define DLT_ATM_RFC1483 as 13 - presumably only
 	 * BSD/OS does so - so that, on BSD/OS systems, we still
-	 * treate 13 as WTAP_ENCAP_ATM_RFC1483, but, on all other
+	 * treat 13 as WTAP_ENCAP_ATM_RFC1483, but, on all other
 	 * systems, we can read OpenBSD DLT_ENC captures.
 	 */
 #if defined(__bsdi__) /* BSD/OS */
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c
index 4e735cdc4e..cdaa2d00ff 100644
--- a/wiretap/peekclassic.c
+++ b/wiretap/peekclassic.c
@@ -33,7 +33,7 @@
 
 /* CREDITS
  *
- * This file decoder could not have been writen without examining how
+ * This file decoder could not have been written without examining how
  * tcptrace (http://www.tcptrace.org/) handles EtherPeek files.
  */
 
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 7276571362..ef8e80c42f 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -29,7 +29,7 @@
 
 /* CREDITS
  *
- * This file decoder could not have been writen without examining
+ * This file decoder could not have been written without examining
  * http://www.varsanofiev.com/inside/airopeekv9.htm, the help from
  * Martin Regner and Guy Harris, and the etherpeek.c file (as it
  * was called before renaming it to peekclassic.c).
diff --git a/wiretap/rfc7468.c b/wiretap/rfc7468.c
index c4e9b04769..856ce99675 100644
--- a/wiretap/rfc7468.c
+++ b/wiretap/rfc7468.c
@@ -19,7 +19,7 @@
 #include <string.h>
 
 /* 128 bytes should be enough to contain any line. Strictly speaking, 64 is
-   enough, but we provide some leeway to accomodate nonconformant producers and
+   enough, but we provide some leeway to accommodate nonconformant producers and
    trailing whitespace. The 2 extra bytes are for the trailing newline and NUL
    terminator. */
 #define MAX_LINE_LENGTH (128 + 2)
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 73d5b39418..3f5504831b 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -104,7 +104,7 @@ static gboolean snoop_dump(wtap_dumper *wdh, const wtap_rec *rec,
  *	http://mrpink.lerc.nasa.gov/118x/support.html
  *
  * had links to modified versions of "tcpdump" and "libpcap" for SUNatm
- * DLPI support; they suggested that the 3.0 verson of SUNatm uses those
+ * DLPI support; they suggested that the 3.0 version of SUNatm uses those
  * values.  The Wayback Machine archived that page, but not the stuff
  * to which it linked, unfortunately.
  *
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 67e865fc5b..d95e925d7c 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -60,7 +60,7 @@ struct visual_file_hdr
     guint16 file_version;       /* Version number of this file format */
     guint32 media_speed;        /* ifSpeed of packet source in bits/sec. */
     guint16 media_param;        /* Media-specific extra parameter. */
-    char    RESERVED_[102];     /* MUST BE ALL ZEROS FOR FUTURE COMPATABILITY */
+    char    RESERVED_[102];     /* MUST BE ALL ZEROS FOR FUTURE COMPATIBILITY */
     char    description[64];    /* File description (null terminated) */
 };
 
diff --git a/wiretap/vms.c b/wiretap/vms.c
index 5161bda65f..0aa83eab7c 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -94,7 +94,7 @@
 The only difference between the utilities is the Packet header line, primarily
 the utility identifier and the packet sequence formats.
 
-There appear to be 2 formats for packet seqencing
+There appear to be 2 formats for packet sequencing
 
 Format 1:
 
diff --git a/wiretap/vwr.c b/wiretap/vwr.c
index 9537e96927..05c7d33d61 100644
--- a/wiretap/vwr.c
+++ b/wiretap/vwr.c
@@ -242,7 +242,7 @@
  * 4 octets - errors
  */
 
-/* Size of Layer-1, PLCP, and Layer-2/4 header incase of OCTO version FPGA */
+/* Size of Layer-1, PLCP, and Layer-2/4 header in case of OCTO version FPGA */
 #define OCTO_LAYER1TO4_LEN          (2+14+16+23)
 
 /*
@@ -270,7 +270,7 @@
 /* Size of RF header with the fields we do supply */
 #define OCTO_MODIFIED_RF_LEN        76              /* 24 bytes of RF are not displayed*/
 
-/*Offset of differnt parameters of RF header for port-1*/
+/*Offset of different parameters of RF header for port-1*/
 #define RF_PORT_1_NOISE_OFF         4
 #define RF_PORT_1_SNR_OFF           6
 #define RF_PORT_1_PFE_OFF           8
@@ -1889,7 +1889,7 @@ static gboolean vwr_read_s3_W_rec(vwr_t *vwr, wtap_rec *record,
         /* Also get a bunch of fields from the stats blocks */
         /* 'stats_offset' variable is use to locate the exact offset.
          * When a RX frame contrains RF,
-         * the postion of Stats, Layer 1-4, PLCP parameters are shifted to
+         * the position of Stats, Layer 1-4, PLCP parameters are shifted to
          * + OCTO_RF_MOD_ACTUAL_LEN bytes
          */
         if (IS_TX == 4)     /*IS_TX =4, i.e., command type is RF-RX Modified*/
@@ -2249,7 +2249,7 @@ static gboolean vwr_read_s3_W_rec(vwr_t *vwr, wtap_rec *record,
     /*** Time Collapsible header ends ***/
     }
 
-    /*** RF Collapsable header starts***/
+    /*** RF Collapsible header starts***/
     if (IS_TX == 3 || IS_TX == 4) {
         phtole8(&data_ptr[bytes_written], rf_id);
         bytes_written += 1;
@@ -2426,7 +2426,7 @@ static gboolean vwr_read_s3_W_rec(vwr_t *vwr, wtap_rec *record,
         }
 ***/
     }
-    /*** RF Collapsable header ends***/
+    /*** RF Collapsible header ends***/
 
     if (IS_TX != 3) {
         /*
@@ -2497,7 +2497,7 @@ static gboolean vwr_read_s3_W_rec(vwr_t *vwr, wtap_rec *record,
         phtolel(&data_ptr[bytes_written], pntoh32(&s_trail_ptr[24]));   /*** 4 bytes for Payload Decode ***/
         bytes_written += 4;
 
-        /*** Incase of RX, Info has 3 bytes of data, whereas for TX, 2 bytes ***/
+        /*** In case of RX, Info has 3 bytes of data, whereas for TX, 2 bytes ***/
         if (IS_TX == 0 || IS_TX == 4) {
             phtoles(&data_ptr[bytes_written], info);
             bytes_written += 2;
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 4d57050920..0d31cc93f4 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -682,7 +682,7 @@ struct ieee_802_11a {
  *    http://wifi-insider.com/atheros/turbo.htm
  */
 #define PHDR_802_11A_TURBO_TYPE_NORMAL           0
-#define PHDR_802_11A_TURBO_TYPE_TURBO            1  /* If we don't know wehther it's static or dynamic */
+#define PHDR_802_11A_TURBO_TYPE_TURBO            1  /* If we don't know whether it's static or dynamic */
 #define PHDR_802_11A_TURBO_TYPE_DYNAMIC_TURBO    2
 #define PHDR_802_11A_TURBO_TYPE_STATIC_TURBO     3
 
@@ -1264,7 +1264,7 @@ union wtap_pseudo_header {
  * They may have a time stamp, and should be dissected and displayed
  * just as packets are.
  *
- * We distingiush between "events" and "reports" so that, for example,
+ * We distinguish between "events" and "reports" so that, for example,
  * the packet display can show the delta between a packet and an event
  * but not show the delta between a packet and a report, as the time
  * stamp of a report may not correspond to anything interesting on
@@ -1544,7 +1544,7 @@ typedef struct hashipv6 {
 } hashipv6_t;
 
 /** A struct with lists of resolved addresses.
- *  Used when writing name resoultion blocks (NRB)
+ *  Used when writing name resolutions blocks (NRB)
  */
 typedef struct addrinfo_lists {
     GList      *ipv4_addr_list; /**< A list of resolved hashipv4_t*/
@@ -2289,7 +2289,7 @@ void wtap_deregister_file_type_subtype(const int file_type_subtype);
 WS_DLL_PUBLIC
 int wtap_register_encap_type(const char *description, const char *name);
 
-/*** Cleanup the interal library structures */
+/*** Cleanup the internal library structures */
 WS_DLL_PUBLIC
 void wtap_cleanup(void);
 
diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h
index 07d3197eee..697a1ed8da 100644
--- a/wiretap/wtap_opttypes.h
+++ b/wiretap/wtap_opttypes.h
@@ -98,7 +98,7 @@ extern "C" {
                                      *     the timestamps stored in the packet must be considered absolute
                                      *     timestamps. The time zone of the offset can be specified with the
                                      *     option if_tzone. TODO: won't a if_tsoffset_low for fractional
-                                     *     second offsets be useful for highly syncronized capture systems?
+                                     *     second offsets be useful for highly synchronized capture systems?
                                      */
 #define OPT_IDB_HARDWARE     15     /**< A UTF-8 string containing the description
                                      *     of the hardware of the device used
@@ -374,7 +374,7 @@ wtap_block_get_ipv6_option_value(wtap_block_t block, guint option_id, ws_in6_add
 WS_DLL_PUBLIC wtap_opttype_return_val
 wtap_block_add_string_option(wtap_block_t block, guint option_id, const char *value, gsize value_length);
 
-/** Add a string option to a block witha printf-formatted string as its value
+/** Add a string option to a block with a printf-formatted string as its value
  *
  * @param[in] block Block to which to add the option
  * @param[in] option_id Identifier value for option
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index bf899f67a6..726e8d8467 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -1666,7 +1666,7 @@ create_persconffile_profile(const char *profilename, char **pf_dir_path_return)
          * Something with that pathname exists; if it's not
          * a directory, we'll get an error if we try to put
          * something in it, so we don't fail here, we wait
-         * for that attempt fo fail.
+         * for that attempt to fail.
          */
         ret = 0;
     }
diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h
index b204fe5932..284dd1d01e 100644
--- a/wsutil/filesystem.h
+++ b/wsutil/filesystem.h
@@ -162,7 +162,7 @@ WS_DLL_PUBLIC int create_persconffile_profile(const char *profilename,
 				       char **pf_dir_path_return);
 
 /*
- * Returns the list of known profile config filesnames
+ * Returns the list of known profile config filenames
  */
 WS_DLL_PUBLIC const GHashTable * allowed_profile_filenames(void);
 
diff --git a/wsutil/nstime.c b/wsutil/nstime.c
index 2b2020d340..16d6e0adcc 100644
--- a/wsutil/nstime.c
+++ b/wsutil/nstime.c
@@ -57,7 +57,7 @@ gboolean nstime_is_unset(const nstime_t *nstime)
 }
 
 
-/** funcion: nstime_copy
+/** function: nstime_copy
  *
  * a = b
  */
diff --git a/wsutil/rsa.c b/wsutil/rsa.c
index c883e3c077..740173db59 100644
--- a/wsutil/rsa.c
+++ b/wsutil/rsa.c
@@ -90,7 +90,7 @@ rsa_load_pem_key(FILE *fp, char **err)
 {
     /* gnutls makes our work much harder, since we have to work internally with
      * s-exp formatted data, but PEM loader exports only in "gnutls_datum_t"
-     * format, and a datum -> s-exp convertion function does not exist.
+     * format, and a datum -> s-exp conversion function does not exist.
      */
     gnutls_x509_privkey_t priv_key;
     gnutls_datum_t        key;
diff --git a/wsutil/strptime.c b/wsutil/strptime.c
index af1fe17d34..e525ca38e6 100644
--- a/wsutil/strptime.c
+++ b/wsutil/strptime.c
@@ -283,7 +283,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
         }
 
       /* Any character but `%' must be matched by the same character
-         in the iput string.  */
+         in the input string.  */
       if (*fmt != '%')
         {
           match_char (*fmt++, *rp++);
diff --git a/wsutil/win32-utils.c b/wsutil/win32-utils.c
index eed56d851d..c8917c694e 100644
--- a/wsutil/win32-utils.c
+++ b/wsutil/win32-utils.c
@@ -232,7 +232,7 @@ BOOL win32_create_process(const char *application_name, const char *command_line
     //     e.g. if we're running under "Run As", ConEmu, or Visual Studio. On Windows
     //     <= 7 our child process needs to break away from it so that we can cleanly
     //     call AssignProcessToJobObject on *our* job.
-    //     Windows >= 8 supports nested jobs so this isn't neccessary there.
+    //     Windows >= 8 supports nested jobs so this isn't necessary there.
     //     https://blogs.msdn.microsoft.com/winsdk/2014/09/22/job-object-insanity/
     //
     if (! IsWindowsVersionOrGreater(6, 2, 0)) { // Windows 8
diff --git a/wsutil/ws_cpuid.h b/wsutil/ws_cpuid.h
index d649e55ced..a8803245b8 100644
--- a/wsutil/ws_cpuid.h
+++ b/wsutil/ws_cpuid.h
@@ -47,7 +47,7 @@ static gboolean
 ws_cpuid(guint32 *CPUInfo _U_, int selector _U_)
 {
 	/*
-	 * TODO: need a test if older proccesors have the cpuid instruction.
+	 * TODO: need a test if older processors have the cpuid instruction.
 	 *
 	 * The correct way to test for this, according to the Intel64/IA-32
 	 * documentation from Intel, in section 17.1 "USING THE CPUID
diff --git a/wsutil/ws_mempbrk_sse42.c b/wsutil/ws_mempbrk_sse42.c
index ac8b8ce105..d0193cec37 100644
--- a/wsutil/ws_mempbrk_sse42.c
+++ b/wsutil/ws_mempbrk_sse42.c
@@ -124,7 +124,7 @@ ws_mempbrk_sse42_exec(const char *haystack, size_t haystacklen, const ws_mempbrk
       if (idx < 16 - offset)
       {
          /* found NUL @ 'idx', need to switch to slower mempbrk */
-         return ws_mempbrk_portable_exec(haystack + idx + 1, haystacklen - idx - 1, pattern, found_needle); /* haystacklen is bigger than 16 & idx < 16 so no undeflow here */
+         return ws_mempbrk_portable_exec(haystack + idx + 1, haystacklen - idx - 1, pattern, found_needle); /* haystacklen is bigger than 16 & idx < 16 so no underflow here */
       }
       aligned += 16;
       haystacklen -= (16 - offset);