From 69d54d6f8e668b6018375121ea2afb99f3dd0177 Mon Sep 17 00:00:00 2001 From: Moshe Kaplan Date: Sun, 19 Dec 2021 21:40:23 -0500 Subject: Corrects repeated words throughout the code. Repeated words were found with: egrep "(\b[a-zA-Z]+) +\1\b" . -Ir and then manually reviewed. Non-displayed strings (e.g., in comments) were also corrected, to ease future review. --- wiretap/ascend-int.h | 2 +- wiretap/camins.c | 2 +- wiretap/dbs-etherwatch.c | 2 +- wiretap/iseries.c | 2 +- wiretap/lanalyzer.c | 2 +- wiretap/netscreen.c | 2 +- wiretap/ngsniffer.c | 2 +- wiretap/wtap.h | 2 +- wiretap/wtap_opttypes.h | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'wiretap') diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h index 6dd2bce181..0db714d93d 100644 --- a/wiretap/ascend-int.h +++ b/wiretap/ascend-int.h @@ -1,7 +1,7 @@ /** @file * * Definitions for routines common to multiple modules in the Lucent/Ascend - * capture file reading code code, but not used outside that code. + * capture file reading code, but not used outside that code. * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/wiretap/camins.c b/wiretap/camins.c index 2a825c6e33..27d26111a6 100644 --- a/wiretap/camins.c +++ b/wiretap/camins.c @@ -152,7 +152,7 @@ static wtap_open_return_val detect_camins_file(FILE_T fh) else { /* We're not searching for a matching block at the moment. If we see a size read/write block of one type, the matching - block is the the other type and we can start searching. */ + block is the other type and we can start searching. */ if (block[1] == TRANS_READ_SIZE_LOW) { search_block = TRANS_READ_SIZE_HIGH; diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c index d620674486..71d7de265b 100644 --- a/wiretap/dbs-etherwatch.c +++ b/wiretap/dbs-etherwatch.c @@ -609,7 +609,7 @@ parse_hex_dump(char* dump, guint8 *buf, char separator, char end) { g_ascii_isxdigit(dump[pos + 1]))) { return 0; } - /* Get the hex value value */ + /* Get the hex value */ if(g_ascii_isdigit(dump[pos])) { buf[count] = (dump[pos] - '0') << 4; } else { diff --git a/wiretap/iseries.c b/wiretap/iseries.c index f8be5025ab..f235c5b3e7 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -101,7 +101,7 @@ /* iSeries IPv6 formatted traces are similar to the IPv4 version above, * except that the higher-level headers have "IPv6 Header:" and - * "ICMPv6 Hdr:", and data data is no longer output in groups of 16 hex + * "ICMPv6 Hdr:", and data is no longer output in groups of 16 hex * digits. * diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 6de5caac51..f5dba22ffe 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -536,7 +536,7 @@ static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh, */ /* - * OK, is the frame data size greater than than what's left of the + * OK, is the frame data size greater than what's left of the * record? */ if (packet_size > record_data_size) { diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index d0b6395cba..b1c6f5a229 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -359,7 +359,7 @@ parse_netscreen_packet(FILE_T fh, wtap_rec *rec, Buffer* buf, offset += n; /* If there was more hex-data than was announced in the len=x - * header, then then there must be an error in the file + * header, then there must be an error in the file */ if (offset > pkt_len) { *err = WTAP_ERR_BAD_FILE; diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 22972740b6..fb5ce0b25b 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -1328,7 +1328,7 @@ process_frame_record(wtap *wth, gboolean is_random, guint *padding, } /* - * Is the frame data size greater than than what's left of the + * Is the frame data size greater than what's left of the * record? */ if (size > rec_length_remaining) { diff --git a/wiretap/wtap.h b/wiretap/wtap.h index fca49eb67e..9a124770f2 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -2292,7 +2292,7 @@ void wtap_cleanup(void); /** The file couldn't be closed, reason unknown */ #define WTAP_ERR_SHORT_READ -12 - /** An attempt to read read less data than it should have */ + /** An attempt to read less data than it should have */ #define WTAP_ERR_BAD_FILE -13 /** The file appears to be damaged or corrupted or otherwise bogus */ diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h index c2e8749eab..7ff372224f 100644 --- a/wiretap/wtap_opttypes.h +++ b/wiretap/wtap_opttypes.h @@ -69,7 +69,7 @@ extern "C" { #define OPT_IDB_SPEED 8 /**< Interface speed (in bps). 100000000 for 100Mbps */ #define OPT_IDB_TSRESOL 9 /**< Resolution of timestamps. If the Most Significant Bit is equal to zero, - * the remaining bits indicates the resolution of the timestamp as as a + * the remaining bits indicates the resolution of the timestamp as a * negative power of 10 (e.g. 6 means microsecond resolution, timestamps * are the number of microseconds since 1/1/1970). If the Most Significant Bit * is equal to one, the remaining bits indicates the resolution has a @@ -148,7 +148,7 @@ typedef struct wtap_block *wtap_block_t; * * Note that, in a given file format, this information won't necessarily * appear in the form of blocks in the file, even though they're presented - * to the caller of libwiretap as blocks when reading and and are presented + * to the caller of libwiretap as blocks when reading and are presented * by the caller of libwiretap as blocks when writing. See, for example, * the iptrace file format, in which the interface name is given as part * of the packet record header; we synthesize those blocks when reading -- cgit v1.2.3