diff options
28 files changed, 33 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 908db10254..35233586de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ include(GNUInstallDirs) set(PROJECT_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") -# Make sure our executables can can load our libraries if we install into +# Make sure our executables can load our libraries if we install into # a non-default directory on Unix-like systems other than macOS. # https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling set(LIBRARY_INSTALL_RPATH "") @@ -579,7 +579,7 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC") ## 4295: array is too small to include a terminating null character ## 4100: unreferenced formal parameter ## 4189: local variable is initialized but not referenced - # Disable warnings about about use of flexible array members: + # Disable warnings about use of flexible array members: ## 4200: nonstandard extension used : zero-sized array in struct/union list(APPEND LOCAL_CFLAGS /w34295 /w34100 /w34189 /wd4200) @@ -1391,7 +1391,7 @@ if (QT_FOUND) # CMake uses qmake to find Qt4. It relies on Qt's CMake modules # to find Qt5. This means that we can't assume that the qmake # in our PATH is the correct one. We can fetch qmake's location - # from Qt5::qmake, which is is defined in Qt5CoreConfigExtras.cmake. + # from Qt5::qmake, which is defined in Qt5CoreConfigExtras.cmake. get_target_property(QT_QMAKE_EXECUTABLE Qt${qtver}::qmake IMPORTED_LOCATION) get_filename_component(_qt_bin_path "${QT_QMAKE_EXECUTABLE}" DIRECTORY) set(QT_BIN_PATH "${_qt_bin_path}" CACHE INTERNAL diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index 74ad7d867d..d5884d4605 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -1889,7 +1889,7 @@ ns_parse_answers_v0(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint * Bit 0 (ISAT_U6): If '1' then the IPv6 endpoint of an unreliable method * (UDP) transport (IP address and port) is present. * - * Bit 1 (ISAT_R6): If '1' the the IPv6 endpoint of a reliable method + * Bit 1 (ISAT_R6): If '1' then the IPv6 endpoint of a reliable method * (TCP) transport (IP address and port) is present. * * Bit 2 (ISAT_U4): If '1' then the IPv4 endpoint of an unreliable method diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index beba56d105..504d81be63 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -3774,7 +3774,7 @@ proto_register_capwap_control(void) NULL, HFILL } }, { &hf_capwap_msg_element_type_decryption_error_report_period_interval, - { "Decryption Error Report Report Interval (Sec)", "capwap.control.message_element.decryption_error_report_period.interval", + { "Decryption Error Report Period Interval (Sec)", "capwap.control.message_element.decryption_error_report_period.interval", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index dee084d573..8dfefc9c72 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -906,7 +906,7 @@ dissect_cmd_data_set(guint32 cmd_data_set, proto_tree* parent_tree, tvbuff_t* tv * Purpose: Dissect the "Cyclic Actual Data" of a Device-to-Controller format message * * Based on the Actual Data Set bits of the "Cyclic Actual Data Block" header, display - * any of those those feedback values. + * any of those feedback values. * * Returns: The number of bytes in the cyclic data used */ diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 9b1065eab7..7bc8cde581 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1689,7 +1689,7 @@ dissect_diameter_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * call_dissector(data_handle, tvb, pinfo, tree); } else if (is_diam == NOT_ENOUGH_DATA) { /* Since we're doing our heuristic checks before - * tcp_dissect_pdus() (since we we can't do heuristics once + * tcp_dissect_pdus() (since we can't do heuristics once * we're in there) we sometimes have to ask for more data... */ pinfo->desegment_offset = 0; diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 5df0b2ce9f..24090daa86 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -542,7 +542,7 @@ proto_register_gre(void) { &hf_gre_flags_ack, { "Acknowledgment", "gre.flags.ack", FT_BOOLEAN, 16, TFS(&tfs_yes_no), GRE_ACK, - "Indicates if the packet packet contains Acknowledgment Number to be used for acknowledging previously transmitted data", HFILL } + "Indicates if the packet contains an Acknowledgment Number to be used for acknowledging previously transmitted data", HFILL } }, { &hf_gre_flags_reserved, { "Flags (Reserved)", "gre.flags.reserved", diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index e927bf9f44..8d7e1f6d61 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1718,7 +1718,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * At this point, any chunked *transfer* coding has been removed * (the entity body has been dechunked) so it can be presented * for the following operation (*content* encoding), or it has - * been been handed off to the data dissector. + * been handed off to the data dissector. * * Handle *content* encodings other than "identity" (which * shouldn't appear in a Content-Encoding header, but diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 67ce8b9d99..2d48453391 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -40,7 +40,7 @@ #include "packet-dns.h" #include "packet-x509af.h" #include "packet-x509if.h" -#include "packet-icmp.h" /* same transaction_t used both both v4 and v6 */ +#include "packet-icmp.h" /* same transaction_t used for both v4 and v6 */ #include "packet-ieee802154.h" #include "packet-6lowpan.h" #include "packet-ip.h" @@ -6094,7 +6094,7 @@ proto_register_icmpv6(void) "The lower-bound sequence number for the MPL Seed.", HFILL }}, { &hf_icmpv6_mpl_seed_info_bm_len, { "Buffered Messages Length", "icmpv6.mpl.seed_info.bm_len", FT_UINT8, BASE_DEC, NULL, MPL_SEED_INFO_BM_LEN, - "The The size of buffered-mpl-messages in octets.", HFILL }}, + "The size of buffered-mpl-messages in octets.", HFILL }}, { &hf_icmpv6_mpl_seed_info_s, { "Seed ID Length", "icmpv6.mpl.seed_info.s", FT_UINT8, BASE_DEC, VALS(mpl_seed_id_lengths), MPL_SEED_INFO_S, "The length of the seed-id.", HFILL }}, diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 52f7ba27b2..0e68f77275 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -505,7 +505,7 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_t if (tlv_len < 1) { expert_add_info_format(pinfo, length_item, &ei_msdp_tlv_len_too_short, - "TLV length for Notification SA-Response Invalid Invalid Sprefix Length Error < 6"); + "TLV length for Notification SA-Response Invalid Sprefix Length Error < 6"); return; } proto_tree_add_item(tree, hf_msdp_not_sprefix_len, tvb, *offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 61a9be0b5a..d6d1e3820d 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2401,7 +2401,7 @@ dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, int frame) tvbuff_t *tvb; tvb = tvb_new_real_data(nfd->fh, nfd->len, nfd->len); /* There's no need to call add_new_data_source() since - dissect_fhandle(), in the the 'hidden' case, never refers + dissect_fhandle(), in the 'hidden' case, never refers to the tvb when displaying a field based on the tvb */ dissect_fhandle_data(tvb, 0, pinfo, tree, nfd->len, TRUE, NULL); tvb_free(tvb); diff --git a/epan/dissectors/packet-oran.c b/epan/dissectors/packet-oran.c index b35a3d6339..382fe190a8 100644 --- a/epan/dissectors/packet-oran.c +++ b/epan/dissectors/packet-oran.c @@ -2000,7 +2000,7 @@ proto_register_oran(void) {"extType", "oran_fh_cus.extType", FT_UINT8, BASE_DEC, VALS(exttype_vals), 0x7f, - "The extension which which provides additional parameters specific to subject data extension", + "The extension type, which provides additional parameters specific to subject data extension", HFILL} }, diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index 2c3b51ea68..1895669fe0 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.c @@ -733,7 +733,7 @@ static int dissect_pcp_message_error(tvbuff_t *tvb, packet_info *pinfo, proto_tr */ static int dissect_pcp_message_start(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) { - /* create a start tree tree to hold the information*/ + /* create a start tree to hold the information*/ proto_item *pcp_start_item; proto_tree *pcp_start_tree; guint32 status; diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index ad4aa70fbf..844191eaac 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -4555,7 +4555,7 @@ proto_register_quic(void) { &hf_quic_dg_length, { "Datagram Length", "quic.dg.length", FT_UINT64, BASE_DEC, NULL, 0x0, - "Specifying the length of the the datagram in bytes", HFILL } + "Specifies the length of the datagram data in bytes", HFILL } }, { &hf_quic_dg, { "Datagram", "quic.dg", diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index e7c20048e3..aaff6e8705 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -1651,7 +1651,7 @@ static ranap_private_data_t* ranap_get_private_data(asn1_ctx_t *actx) return private_data; } -/* Helper function to reset the the private data struct */ +/* Helper function to reset the private data struct */ static void ranap_reset_private_data(packet_info *pinfo) { p_remove_proto_data(pinfo->pool, pinfo, proto_ranap, 0); diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h index 6db5ec3876..26fd292035 100644 --- a/epan/dissectors/packet-scsi.h +++ b/epan/dissectors/packet-scsi.h @@ -72,7 +72,7 @@ typedef struct _itlq_nexus_t { nstime_t fc_time; - void *extra_data; /* extra data that that is task specific */ + void *extra_data; /* extra data that is task specific */ } itlq_nexus_t; diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 1a7ada9c58..1a838c12c0 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -10156,7 +10156,7 @@ proto_register_skinny(void) {&hf_skinny_statsProcessingMode, { "Stats Processing Mode", "skinny.statsProcessingMode", FT_UINT32, BASE_HEX | BASE_EXT_STRING, &StatsProcessingType_ext, 0x0, - "What do do after you send the stats", HFILL }}, + "What to do after you send the stats", HFILL }}, {&hf_skinny_status, { "status", "skinny.status", FT_UINT32, BASE_HEX | BASE_EXT_STRING, &DeviceUnregisterStatus_ext, 0x0, diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index b10eb184b1..5e064f856b 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1603,7 +1603,7 @@ mpf_value(guint8 th_byte) * This consumes resources. A trickier way, but a way which works, is to * always map the "LAST" BIU segment to frag-number 2. Here's the trickery: * if we add frag-number 2, which we know to be the "LAST" BIU segment, - * and the reassembly code tells us that the the BIU is still not reassmebled, + * and the reassembly code tells us that the BIU is still not reassmebled, * then, owing to the, ahem, /fact/, that fragmented BIU segments arrive * in order :), we know that 1) "FIRST" did come, and 2) there's no "MIDDLE", * because this BIU was fragmented into 2 frames, not 3. So, we'll be diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index eb862c462a..eae7649745 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3450,7 +3450,7 @@ again: * retransmissions, but could there be a case where it prevents * "tcp_reassemble_out_of_order" from functioning due to skipping * retransmission of a lost segment? - * If the latter is enabled, it could use use "maxnextseq" for ignoring + * If the latter is enabled, it could use "maxnextseq" for ignoring * retransmitted single-segment PDUs (that would require storing * per-packet state (tcp_per_packet_data_t) to make it work for two-pass * and random access dissection). Retransmitted segments that are part diff --git a/epan/dissectors/packet-tplink-smarthome.c b/epan/dissectors/packet-tplink-smarthome.c index e8e0a7f45d..d648dfc9ef 100644 --- a/epan/dissectors/packet-tplink-smarthome.c +++ b/epan/dissectors/packet-tplink-smarthome.c @@ -82,7 +82,7 @@ dissect_tplink_smarthome_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if (pinfo->ptype == PT_TCP) { proto_tree_add_item(tplink_smarthome_tree, hf_tplink_smarthome_Len, - tvb, 0, FRAME_HEADER_LEN, ENC_BIG_ENDIAN); /* decode the the 4 byte message length field pre-pended in a TCP message, */ + tvb, 0, FRAME_HEADER_LEN, ENC_BIG_ENDIAN); /* decode the 4 byte message length field pre-pended in a TCP message, */ } guint8 c, d; guint8 key = 171; diff --git a/epan/oids.h b/epan/oids.h index 2caa137726..04bd5ab078 100644 --- a/epan/oids.h +++ b/epan/oids.h @@ -108,7 +108,7 @@ WS_DLL_PUBLIC void oids_cleanup(void); /* * The objects returned by all these functions are all allocated with a - * packet lifetime and does not have have to be freed. + * packet lifetime and do not have to be freed. * However, take into account that when the packet dissection * completes, these buffers will be automatically reclaimed/freed. * If you need the buffer to remain for a longer scope than packet lifetime diff --git a/plugins/epan/transum/extractors.c b/plugins/epan/transum/extractors.c index d52583436a..4e912e2a76 100644 --- a/plugins/epan/transum/extractors.c +++ b/plugins/epan/transum/extractors.c @@ -16,7 +16,7 @@ /* This function extracts a field value (e.g. tcp.len) from a tree. Because a packet may contain - multiple values for the the field the extracted values are returned in a result_array. The + multiple values for the field, the extracted values are returned in a result_array. The number of array entries is returned in element_count. Return is 0 if all went well. If this function return -1 it is probably because the tree did not diff --git a/tools/WiresharkXML.py b/tools/WiresharkXML.py index d67e56d297..02d2cadf22 100755 --- a/tools/WiresharkXML.py +++ b/tools/WiresharkXML.py @@ -245,7 +245,7 @@ class ParseXML(xml.sax.handler.ContentHandler): # Add element as child to previous element as long # as there is more than 1 element in the stack. Only - # one element in the stack means that the the element in + # one element in the stack means that the element in # the stack is the single CaptureFile element, and we don't # want to add this element to that, as we only want one # Packet element in memory at a time. diff --git a/tools/fix-encoding-args.pl b/tools/fix-encoding-args.pl index a4b714cea9..f124314a30 100755 --- a/tools/fix-encoding-args.pl +++ b/tools/fix-encoding-args.pl @@ -479,7 +479,7 @@ sub find_hf_array_entries { # Find all the <fcn_name>() statements wherein the encoding arg is a value other than # one of the "replace" values. # Uses zero-length negative-lookahead to find <fcn_name>() statements for which the encoding - # arg is something other than one of the the provided replace values. + # arg is something other than one of the provided replace values. # Escape any "|" characters in the values to be matched # and then create "alternatives" string containing all the value strings. Ex: "A|B|C\|D|..." my $match_str = join "|", map { my $copy = $_; $copy =~ s{ ( \| ) }{\\$1}gx; $copy } values %$searchReplaceHRef; diff --git a/tools/test-common.sh b/tools/test-common.sh index bc3f6f291e..42d78e8ad7 100755 --- a/tools/test-common.sh +++ b/tools/test-common.sh @@ -41,7 +41,7 @@ MAX_PASSES=0 MAX_CPU_TIME=600 # Stop the child process if it's using more than y * 1024 bytes MAX_VMEM=1000000 -# Stop the child process if its stack is larger than than z * 1024 bytes +# Stop the child process if its stack is larger than z * 1024 bytes # Windows XP: 2033 # Windows 7: 2034 # Mac OS X 10.6: 8192 diff --git a/tools/yacc.py b/tools/yacc.py index ee088cfec7..1352e96334 100644 --- a/tools/yacc.py +++ b/tools/yacc.py @@ -556,7 +556,7 @@ class LRParser: # If there are any synchronization rules, they may # catch it. # - # In addition to pushing the error token, we call call + # In addition to pushing the error token, we call # the user defined p_error() function if this is the # first syntax error. This function is only called if # errorcount == 0. @@ -856,7 +856,7 @@ class LRParser: # If there are any synchronization rules, they may # catch it. # - # In addition to pushing the error token, we call call + # In addition to pushing the error token, we call # the user defined p_error() function if this is the # first syntax error. This function is only called if # errorcount == 0. @@ -1142,7 +1142,7 @@ class LRParser: # If there are any synchronization rules, they may # catch it. # - # In addition to pushing the error token, we call call + # In addition to pushing the error token, we call # the user defined p_error() function if this is the # first syntax error. This function is only called if # errorcount == 0. @@ -3658,7 +3658,7 @@ process_cap_file(capture_file *cf, char *save_file, int out_file_type, * If we got a read error on the first pass, we still do the second * pass, so we can at least process the packets we read, and then * report the first-pass error after the second pass (and before - * we report any second-pass errors), so all the the errors show up + * we report any second-pass errors), so all the errors show up * at the end. */ second_pass_status = process_cap_file_second_pass(cf, pdh, &err, &err_info, diff --git a/ui/qt/widgets/wireshark_file_dialog.h b/ui/qt/widgets/wireshark_file_dialog.h index 9722ff37ed..43ac67a655 100644 --- a/ui/qt/widgets/wireshark_file_dialog.h +++ b/ui/qt/widgets/wireshark_file_dialog.h @@ -17,7 +17,7 @@ * * Qt <= 5.9 supports setting old (Windows 8.1) per-monitor DPI awareness * via Qt:AA_EnableHighDpiScaling. We do this in main.cpp. In order for - * native dialogs to be rendered correctly we need to to set per-monitor + * native dialogs to be rendered correctly we need to set per-monitor * *v2* awareness prior to creating the dialog. * Qt doesn't render correctly when per-monitor v2 awareness is enabled, so * we need to revert our thread context when we're done. diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h index 8d172f16cf..d99b0ee3e6 100644 --- a/ui/simple_dialog.h +++ b/ui/simple_dialog.h @@ -91,7 +91,7 @@ typedef enum { * * Explicitly passing in separate primary and secondary messages would let us * get rid of primary_start and primary_end and reduce the amount of - * gymnastics we have to to in the Qt UI. + * gymnastics we have to do in the Qt UI. */ extern gpointer simple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...) |