From: Francois-Xavier Le Bail Date: Mon, 4 Jul 2022 09:39:26 +0000 (+0200) Subject: Fix some typos X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/fc4772e1e1b3b2a25937b99981ca0a67cc17caba Fix some typos [skip ci] --- diff --git a/CHANGES b/CHANGES index 25d51c81..ff2007aa 100644 --- a/CHANGES +++ b/CHANGES @@ -49,7 +49,7 @@ Monthday, Month DD, YYYY: Packet filtering: Get PFLOG header length from the length value in the header. Support all the direction, reason, and action types supported by - all systems that sypport PFLOG. + all systems that support PFLOG. Don't require PFLOG support on the target machine in order to support PFLOG filtering (also fixes issue #1076). Linux: @@ -378,7 +378,7 @@ Sunday, July 22, 2018 need to be Fix reading of capture statistics for Linux USB Fix packet size values for Linux USB packets (GitHub issue #808) - Check only VID in VLAN test in filterss (GitHub issue #461) + Check only VID in VLAN test in filters (GitHub issue #461) Fix pcap_list_datalinks on 802.11 devices on macOS Fix overflows with very large snapshot length in pcap file Improve parsing of rpcapd configuration file (GitHub issue #767) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1051b0b1..f01f7620 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2211,7 +2211,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "IRIX" OR CMAKE_SYSTEM_NAME STREQUAL "IRIX64") set(MAN_MISC_INFO 5) elseif(CMAKE_SYSTEM_NAME STREQUAL "OSF1") # - # DEC OSF/1, a/k/a Digial UNIX, a/k/a Tru64 UNIX. + # DEC OSF/1, a/k/a Digital UNIX, a/k/a Tru64 UNIX. # Use Tru64 UNIX conventions for man pages; they're the same as the # System V conventions except that they use section 8 for # administrative commands and daemons. diff --git a/configure b/configure index 477a27eb..b40f4398 100755 --- a/configure +++ b/configure @@ -9570,7 +9570,7 @@ osf*) DYEXT="so" # - # DEC OSF/1, a/k/a Digial UNIX, a/k/a Tru64 UNIX. + # DEC OSF/1, a/k/a Digital UNIX, a/k/a Tru64 UNIX. # Use Tru64 UNIX conventions for man pages; they're the same as # the System V conventions except that they use section 8 for # administrative commands and daemons. diff --git a/configure.ac b/configure.ac index 3a6bb730..9ead8cee 100644 --- a/configure.ac +++ b/configure.ac @@ -2221,7 +2221,7 @@ osf*) DYEXT="so" # - # DEC OSF/1, a/k/a Digial UNIX, a/k/a Tru64 UNIX. + # DEC OSF/1, a/k/a Digital UNIX, a/k/a Tru64 UNIX. # Use Tru64 UNIX conventions for man pages; they're the same as # the System V conventions except that they use section 8 for # administrative commands and daemons. diff --git a/extract.h b/extract.h index e776a9eb..33579b11 100644 --- a/extract.h +++ b/extract.h @@ -127,7 +127,7 @@ EXTRACT_BE_S_8(const void *p) * cast the pointer to point to one of those, and fetch through it; * the GCC manual doesn't appear to explicitly say that * __attribute__((packed)) causes the compiler to generate unaligned-safe - * code, but it apppears to do so. + * code, but it appears to do so. * * We do this in case the compiler can generate code using those * instructions to do an unaligned load and pass stuff to "ntohs()" or diff --git a/pcap-dag.c b/pcap-dag.c index b7a74163..f261ead0 100644 --- a/pcap-dag.c +++ b/pcap-dag.c @@ -736,7 +736,7 @@ dag_inject(pcap_t *p, const void *buf _U_, int size _U_) * API polling parameters. * * snaplen is now also ignored, until we get per-stream slen support. Set - * slen with approprite DAG tool BEFORE pcap_activate(). + * slen with appropriate DAG tool BEFORE pcap_activate(). * * See also pcap(3). */ diff --git a/pcap-linux.c b/pcap-linux.c index 8dbf89bc..60187eb8 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -1485,7 +1485,7 @@ get_if_ioctl_socket(void) * capture on them, "why do no interfaces show up?" - when the * real problem is a permissions problem. Error reports of that * type require a lot more back-and-forth to debug, as evidenced - * by many Wireshark bugs/mailing list questions/Q&A questoins.) + * by many Wireshark bugs/mailing list questions/Q&A questions.) * * So: * diff --git a/pcap-npf.c b/pcap-npf.c index 70653df7..0f220d64 100644 --- a/pcap-npf.c +++ b/pcap-npf.c @@ -912,7 +912,7 @@ pcap_read_win32_dag(pcap_t *p, int cnt, pcap_handler callback, u_char *user) } } - /* Fill the header for the user suppplied callback function */ + /* Fill the header for the user supplied callback function */ pcap_header.caplen = caplen; pcap_header.len = packet_len; diff --git a/pcap-septel.c b/pcap-septel.c index e917edd7..270a1afb 100644 --- a/pcap-septel.c +++ b/pcap-septel.c @@ -93,7 +93,7 @@ loop: h = GCT_grab(id); m = (MSG*)h; - /* a couter is added here to avoid an infinite loop + /* a counter is added here to avoid an infinite loop * that will cause our capture program GUI to freeze while waiting * for a packet*/ counter++ ; diff --git a/pcap-sita.c b/pcap-sita.c index 16475729..2e5d4426 100644 --- a/pcap-sita.c +++ b/pcap-sita.c @@ -492,7 +492,7 @@ static char *translate_IOP_to_pcap_name(unit_t *u, char *IOPname, bpf_u_int32 if u->iface = iface; /* stick this entry at the head of the list */ } else { iface_ptr = u->iface; - while (iface_ptr->next) { /* othewise scan the list */ + while (iface_ptr->next) { /* otherwise scan the list */ iface_ptr = iface_ptr->next; /* till we're at the last entry */ } iface_ptr->next = iface; /* then tack this entry on the end of the list */ diff --git a/pcap.3pcap.in b/pcap.3pcap.in index a43f7a09..e98932d8 100644 --- a/pcap.3pcap.in +++ b/pcap.3pcap.in @@ -720,7 +720,7 @@ periodically for packets; in that case, will return a pointer to a .B struct timeval whose value can be used as a timeout in those routines. When the -routine returns, an attmept should be made to read packets from the +routine returns, an attempt should be made to read packets from the device. If .BR pcap_get_required_select_timeout () returns diff --git a/pcap.c b/pcap.c index fe0762a3..0d427a66 100644 --- a/pcap.c +++ b/pcap.c @@ -4111,7 +4111,7 @@ pcap_close(pcap_t *p) } /* - * Helpers for safely loding code at run time. + * Helpers for safely loading code at run time. * Currently Windows-only. */ #ifdef _WIN32 diff --git a/rpcapd/fileconf.c b/rpcapd/fileconf.c index b79dda18..c051f887 100644 --- a/rpcapd/fileconf.c +++ b/rpcapd/fileconf.c @@ -386,7 +386,7 @@ void fileconf_read(void) // // Append this to the host list. - // Save the curren end-of-string for the + // Save the current end-of-string for the // host list, in case the new host doesn't // fit, so that we can discard the partially- // copied host name. diff --git a/sf-pcap.c b/sf-pcap.c index 35ca265e..05119b57 100644 --- a/sf-pcap.c +++ b/sf-pcap.c @@ -578,7 +578,7 @@ pcap_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char **data) * userland. * * However, perhaps some versions of libpcap failed to - * set the snapshot length currectly in the file header + * set the snapshot length correctly in the file header * or the per-packet header, or perhaps this is a * corrupted safefile or a savefile built/modified by a * fuzz tester, so we check anyway. We grow the buffer diff --git a/sockutils.c b/sockutils.c index d9762dd5..a34f0d17 100644 --- a/sockutils.c +++ b/sockutils.c @@ -93,7 +93,7 @@ * * On Windows, send() and recv() return an int. * - * Wth MSVC, there *is* no ssize_t. + * With MSVC, there *is* no ssize_t. * * With MinGW, there is an ssize_t type; it is either an int (32 bit) * or a long long (64 bit). diff --git a/testprogs/valgrindtest.c b/testprogs/valgrindtest.c index 058b18be..55055ca3 100644 --- a/testprogs/valgrindtest.c +++ b/testprogs/valgrindtest.c @@ -109,7 +109,7 @@ The Regents of the University of California. All rights reserved.\n"; * also include to open the device in the first place, and that * means that we may get collisions between their definitions of * BPF_STMT and BPF_JUMP - and do, in fact, get them on Linux (the - * definitons may be semantically the same, but that's not sufficient to + * definitions may be semantically the same, but that's not sufficient to * avoid the warnings, as the preprocessor doesn't know that u_short is * just unsigned short). * diff --git a/testprogs/visopts.py b/testprogs/visopts.py index bcc34af8..f7df45a5 100755 --- a/testprogs/visopts.py +++ b/testprogs/visopts.py @@ -5,7 +5,7 @@ This program parses the output from pcap_compile() to visualize the CFG after each optimize phase. Usage guide: -1. Enable optimizier debugging code when configure libpcap, +1. Enable optimizer debugging code when configure libpcap, and build libpcap & the test programs ./configure --enable-optimizer-dbg make