Fix some spelling. [skip ci]

infrastation · infrastation · commit bcca74d2713d · 2020-10-09T13:08:31.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -682,7 +682,7 @@ Tuesday January 9, 2001. guy@alum.mit.edu. Summary for 0.6 release
 
 	Header files fixed to allow use in C++ programs.
 
-	Removed dependancy on native headers for packet layout.
+	Removed dependency on native headers for packet layout.
 	Removed Linux specific headers that were shipped.
 
 	Security fixes: Strcpy replaced with strlcpy, sprintf replaced
diff --git a/INSTALL.md b/INSTALL.md
@@ -188,7 +188,7 @@ If you use SINIX, you should be able to build libpcap from this
 release. It is known to compile and run on SINIX-Y/N 5.42 with the C-DS
 V1.0 or V1.1 compiler. But note that in some releases of SINIX, yacc
 emits incorrect code; if grammar.y fails to compile, change every
-occurence of:
+occurrence of:
 
 	#ifdef YYDEBUG
 
diff --git a/aclocal.m4 b/aclocal.m4
@@ -1078,7 +1078,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
diff --git a/doc/README.capture-module b/doc/README.capture-module
@@ -232,13 +232,13 @@ structure:
 		called whnever pcap_set_datalink() is called
 
 	getnonblock_op
-		called whenver pcap_getnonblock() is called
+		called whenever pcap_getnonblock() is called
 
 	setnonblock_op
 		called whenever pcap_setnonblock() is called
 
 	stats_op
-		called whenver pcap_stats() is called
+		called whenever pcap_stats() is called
 
 	cleanup_op
 		called if the activate routine fails or pcap_close() is
diff --git a/doc/README.hpux b/doc/README.hpux
@@ -159,7 +159,7 @@ An additional note, from Jost Martin, for HP-UX 10.20:
 	   of an interface
 	A: You need to get PHNE_20892,PHNE_20725 and PHCO_10947 (or
 	   newer, this is as of 4.4.00) and its dependencies.  Then you can
-	   enable the feature as descibed below:
+	   enable the feature as described below:
 
 	Patch Name: PHNE_20892
 	Patch Description: s700 10.20 PCI 100Base-T cumulative patch
diff --git a/pcap-common.c b/pcap-common.c
@@ -326,7 +326,7 @@
  * input packets such as port scans, packets from old lost connections,
  * etc. to force the connection to stay up).
  *
- * The first byte of the PPP header (0xff03) is modified to accomodate
+ * The first byte of the PPP header (0xff03) is modified to accommodate
  * the direction - 0x00 = IN, 0x01 = OUT.
  */
 #define LINKTYPE_PPP_PPPD	166
@@ -1104,7 +1104,7 @@
 
 /*
  * DisplayPort AUX channel monitoring data as specified by VESA
- * DisplayPort(DP) Standard preceeded by a pseudo-header.
+ * DisplayPort(DP) Standard preceded by a pseudo-header.
  *    per dirk.eibach at gdsys.cc
  */
 #define LINKTYPE_DISPLAYPORT_AUX	275
diff --git a/pcap-dag.c b/pcap-dag.c
@@ -333,7 +333,7 @@ dag_erf_ext_header_count(uint8_t * erf, size_t len)
 /*
  *  Read at most max_packets from the capture stream and call the callback
  *  for each of them. Returns the number of packets handled, -1 if an
- *  error occured, or -2 if we were told to break out of the loop.
+ *  error occurred, or -2 if we were told to break out of the loop.
  */
 static int
 dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
diff --git a/pcap-dos.c b/pcap-dos.c
@@ -943,7 +943,7 @@ static void pcap_init_hook (void)
 }
 
 /*
- * Supress PRINT message from Watt-32's sock_init()
+ * Suppress PRINT message from Watt-32's sock_init()
  */
 static void null_print (void) {}
 
diff --git a/pcap-linux.c b/pcap-linux.c
@@ -2539,7 +2539,7 @@ activate_pf_packet(pcap_t *handle, int is_any_device)
 		}
 	}
 
-	/* Enable auxillary data if supported and reserve room for
+	/* Enable auxiliary data if supported and reserve room for
 	 * reconstructing VLAN headers. */
 #ifdef HAVE_PACKET_AUXDATA
 	val = 1;
@@ -3056,7 +3056,7 @@ create_ring(pcap_t *handle, int *status)
 		return -1;
 	}
 
-	/* compute the minumum block size that will handle this frame.
+	/* compute the minimum block size that will handle this frame.
 	 * The block has to be page size aligned.
 	 * The max block size allowed by the kernel is arch-dependent and
 	 * it's not explicitly checked here. */
@@ -4297,7 +4297,7 @@ pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter)
 		if ((err = set_kernel_filter(handle, &fcode)) == 0)
 		{
 			/*
-			 * Installation succeded - using kernel filter,
+			 * Installation succeeded - using kernel filter,
 			 * so userland filtering not needed.
 			 */
 			handlep->filter_in_userland = 0;
diff --git a/pcap-npf.c b/pcap-npf.c
@@ -286,7 +286,7 @@ pcap_stats_ex_npf(pcap_t *p, int *pcap_stat_size)
 	p->stat.ps_ifdrop = bstats.ps_ifdrop;
 	/*
 	 * Just in case this is ever compiled for a target other than
-	 * Windows, which is somewhere between extemely unlikely and
+	 * Windows, which is somewhere between extremely unlikely and
 	 * impossible.
 	 */
 #ifdef _WIN32
diff --git a/pcap-septel.c b/pcap-septel.c
@@ -45,7 +45,7 @@ struct pcap_septel {
 /*
  *  Read at most max_packets from the capture queue and call the callback
  *  for each of them. Returns the number of packets handled, -1 if an
- *  error occured, or -2 if we were told to break out of the loop.
+ *  error occurred, or -2 if we were told to break out of the loop.
  */
 static int septel_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user) {
 
diff --git a/pcap-sita.c b/pcap-sita.c
@@ -755,9 +755,9 @@ static void wait_for_all_answers(void) {
 
 		memcpy(&working_set, &readfds, sizeof(readfds));				/* otherwise, we still have to listen for more stuff, till we timeout */
 		retval = select(max_fs + 1, &working_set, NULL, NULL, &tv);
-		if (retval == -1) {												/* an error occured !!!!! */
+		if (retval == -1) {												/* an error occurred !!!!! */
 			return;
-		} else if (retval == 0) {										/* timeout occured, so process what we've got sofar and return */
+		} else if (retval == 0) {										/* timeout occurred, so process what we've got sofar and return */
 			printf("timeout\n");
 			return;
 		} else {
@@ -935,10 +935,10 @@ static int acn_read_n_bytes_with_timeout(pcap_t *handle, int count) {
 	bp = handle->bp;
 	while (count) {
 		retval = select(fd + 1, &w_fds, NULL, NULL, &tv);
-		if (retval == -1) {											/* an error occured !!!!! */
+		if (retval == -1) {											/* an error occurred !!!!! */
 //			fprintf(stderr, "error during packet data read\n");
 			return -1;										/* but we need to return a good indication to prevent unnecessary popups */
-		} else if (retval == 0) {									/* timeout occured, so process what we've got sofar and return */
+		} else if (retval == 0) {									/* timeout occurred, so process what we've got sofar and return */
 //			fprintf(stderr, "timeout during packet data read\n");
 			return -1;
 		} else {
diff --git a/pcap-sita.html b/pcap-sita.html
@@ -31,7 +31,7 @@ <H3>SUMMARY</H3>
 			<TR>
 				<TH VALIGN=TOP>SMP</TH>
 				<TD VALIGN=TOP>The Supervisory Management Processor where Wireshark (or equivalent)
-								runs in conjuction with a libpcap front-end.</TD>
+								runs in conjunction with a libpcap front-end.</TD>
 			</TR>
 			<TR>
 				<TH VALIGN=TOP>IOP</TH>
@@ -43,7 +43,7 @@ <H3>SUMMARY</H3>
 	<P>
 	Each IOP will be capable of supporting multiple connections from an SMP
 	enabling monitoring of more than one interface at a time, each through
-	its own seperate connection.  The IOP is responsible to ensure and report
+	its own separate connection.  The IOP is responsible to ensure and report
 	an error if any attempt is made to monitor the same interface more than once.
 	<P>
 	There are three applications that will be supported by the ACN version of libpcap.
@@ -121,8 +121,8 @@ <H3>ROUTINES</H3>
 		<TR><TH VALIGN=TOP NOWRAP>IOP -> SMP</TH>
 			<TD>
 			After any required processing is complete, the IOP will return a
-			null terminated string containing an error message if one occured.
-			If no error occured, a empty string is still returned.
+			null terminated string containing an error message if one occurred.
+			If no error occurred, a empty string is still returned.
 			Errors are:
 			<UL>
 			<LI>"Interface (xxx) does not exist."
@@ -298,7 +298,7 @@ <H3>ROUTINES</H3>
 			<TD>
 			The SMP reads only the next packet from the reverse channel of the connection
 			between the SMP and the IOP that provides the captured data (via calling pcap_dispatch()
-			with a count of 1) and returns seperate pointers to both the
+			with a count of 1) and returns separate pointers to both the
 			packet header and packet data by invoking an internal callback.
 			</TD>
 		</TR>
@@ -322,7 +322,7 @@ <H3>ROUTINES</H3>
 		<TR><TH VALIGN=TOP NOWRAP>IOP -> SMP</TH>
 			<TD>
 			The IOP returns a null terminated error string if it failed to accept the filter.
-			If no error occured, then a NULL terminated empty string is returned instead.
+			If no error occurred, then a NULL terminated empty string is returned instead.
 			Errors are:
 			<UL>
 			<LI>"Invalid BPF."
@@ -370,7 +370,7 @@ <H3>ROUTINES</H3>
 			If the IOP detects that its communication session with an SMP
 			has closed, it will terminate any monitoring in progress,
 			release any resources and close its end of the session.
-			It will not maintain persistance of any information or prior mode of operation.
+			It will not maintain persistence of any information or prior mode of operation.
 			</TD>
 		</TR>
 	</TABLE></TD></TR>
@@ -442,7 +442,7 @@ <H3>SMP/IOP Inter-Process Communication Protocol</H3>
 			<TD VALIGN=TOP ALIGN=CENTER NOWRAP>IOP -> SMP</TD>
 			<TD VALIGN=TOP>The IOP returns a list of sequences of information as
 				defined by the return parameter of this function call (as shown in the following table).
-				Elements are specified by providing an unsigned byte preceeding the actual data that contains length information.
+				Elements are specified by providing an unsigned byte preceding the actual data that contains length information.
 				<P>
 				<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=3>
 				<TR>
@@ -839,7 +839,7 @@ <H4>ACN Custom Packet Header</H4>
 	<UL>
 	PCAP, Wireshark and Tcpdump enhancements have been added to the ACN to support
 	monitoring of its ports, however each of these facilities were focused on capturing
-	and displaying traffic from LAN interfaces.  The SITA extentions to these facilities
+	and displaying traffic from LAN interfaces.  The SITA extensions to these facilities
 	are used to also provide the ability to capture, filter, and display information from
 	an ACN's WAN ports.
 	<P>
@@ -849,7 +849,7 @@ <H4>ACN Custom Packet Header</H4>
 	<P>
 	<UL TYPE=DISC>
 		<LI>For Ethernet (like) devices, the packet format is unchanged from the standard Pcap format.
-		<LI>For WAN devices, the packet contains a 5 byte header that preceeds the actual captured data
+		<LI>For WAN devices, the packet contains a 5 byte header that precedes the actual captured data
 			described by the following table:
 	</UL>
 	<P>
diff --git a/pcap/dlt.h b/pcap/dlt.h
@@ -473,7 +473,7 @@
  * interface (irdaX), but not on a raw serial port.
  * Note the capture is done in "Linux-cooked" mode, so each packet include
  * a fake packet header (struct sll_header). This is because IrDA packet
- * decoding is dependant on the direction of the packet (incomming or
+ * decoding is dependent on the direction of the packet (incoming or
  * outgoing).
  * When/if other platform implement IrDA capture, we may revisit the
  * issue and define a real DLT_IRDA...
@@ -565,7 +565,7 @@
  * input packets such as port scans, packets from old lost connections,
  * etc. to force the connection to stay up).
  *
- * The first byte of the PPP header (0xff03) is modified to accomodate
+ * The first byte of the PPP header (0xff03) is modified to accommodate
  * the direction - 0x00 = IN, 0x01 = OUT.
  */
 #define DLT_PPP_PPPD		166
@@ -1393,7 +1393,7 @@
 
 /*
  * DisplayPort AUX channel monitoring data as specified by VESA
- * DisplayPort(DP) Standard preceeded by a pseudo-header.
+ * DisplayPort(DP) Standard preceded by a pseudo-header.
  *    per dirk.eibach at gdsys.cc
  */
 #define DLT_DISPLAYPORT_AUX	275
diff --git a/pcap/pcap.h b/pcap/pcap.h
@@ -727,8 +727,8 @@ PCAP_API const char *pcap_lib_version(void);
  * - rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol]
  * - rpcap://host/devicename [opens the selected device available on a remote host]
  * - rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP]
- * - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged]
- * - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged]
+ * - adaptername [to open a local adapter; kept for compatibility, but it is strongly discouraged]
+ * - (NULL) [to open the first local adapter; kept for compatibility, but it is strongly discouraged]
  *
  * The formats allowed by the pcap_findalldevs_ex() are the following:
  * - file://folder/ [lists all the files in the given folder]
diff --git a/rpcap-protocol.h b/rpcap-protocol.h
@@ -306,7 +306,7 @@ struct rpcap_filter
 	uint32 nitems;		/* Number of items contained into the filter (e.g. BPF instructions for BPF filters) */
 };
 
-/* Structure that keeps a single BPF instuction; it is repeated 'ninsn' times according to the 'rpcap_filterbpf' header */
+/* Structure that keeps a single BPF instruction; it is repeated 'ninsn' times according to the 'rpcap_filterbpf' header */
 struct rpcap_filterbpf_insn
 {
 	uint16 code;	/* opcode of the instruction */
diff --git a/sockutils.c b/sockutils.c
@@ -290,7 +290,7 @@ static int sock_ismcastaddr(const struct sockaddr *saddr)
  *
  * In case of a server socket, the function calls socket(), bind() and listen().
  *
- * This function is usually preceeded by the sock_initaddress().
+ * This function is usually preceded by the sock_initaddress().
  *
  * \param addrinfo: pointer to an addrinfo variable which will be used to
  * open the socket and such. This variable is the one returned by the previous call to
diff --git a/testprogs/BPF/1.txt b/testprogs/BPF/1.txt
@@ -1,2 +1,2 @@
-# common block merging, same block elimination, result propogation
+# common block merging, same block elimination, result propagation
 host 192.168.1.1

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ static void pcap_init_hook (void)`
`943`	`943`	`}`
`944`	`944`
`945`	`945`	`/*`
`946`		`- * Supress PRINT message from Watt-32's sock_init()`
	`946`	`+ * Suppress PRINT message from Watt-32's sock_init()`
`947`	`947`	`*/`
`948`	`948`	`static void null_print (void) {}`
`949`	`949`
Original file line number	Diff line number	Diff line change
`@@ -2539,7 +2539,7 @@ activate_pf_packet(pcap_t *handle, int is_any_device)`
`2539`	`2539`	`}`
`2540`	`2540`	`}`
`2541`	`2541`
`2542`		`- /* Enable auxillary data if supported and reserve room for`
	`2542`	`+ /* Enable auxiliary data if supported and reserve room for`
`2543`	`2543`	`* reconstructing VLAN headers. */`
`2544`	`2544`	`#ifdef HAVE_PACKET_AUXDATA`
`2545`	`2545`	`val = 1;`
`@@ -3056,7 +3056,7 @@ create_ring(pcap_t handle, int status)`
`3056`	`3056`	`return -1;`
`3057`	`3057`	`}`
`3058`	`3058`
`3059`		`- /* compute the minumum block size that will handle this frame.`
	`3059`	`+ /* compute the minimum block size that will handle this frame.`
`3060`	`3060`	`* The block has to be page size aligned.`
`3061`	`3061`	`* The max block size allowed by the kernel is arch-dependent and`
`3062`	`3062`	`* it's not explicitly checked here. */`
`@@ -4297,7 +4297,7 @@ pcap_setfilter_linux(pcap_t handle, struct bpf_program filter)`
`4297`	`4297`	`if ((err = set_kernel_filter(handle, &fcode)) == 0)`
`4298`	`4298`	`{`
`4299`	`4299`	`/*`
`4300`		`- * Installation succeded - using kernel filter,`
	`4300`	`+ * Installation succeeded - using kernel filter,`
`4301`	`4301`	`* so userland filtering not needed.`
`4302`	`4302`	`*/`
`4303`	`4303`	`handlep->filter_in_userland = 0;`