diff options
97 files changed, 143 insertions, 143 deletions
diff --git a/capture/airpcap.h b/capture/airpcap.h index 8cbc956948..48de30d3e7 100644 --- a/capture/airpcap.h +++ b/capture/airpcap.h @@ -245,7 +245,7 @@ typedef struct _AirpcapStats /* < from the beginning of the current capture. This value includes the packets */ /* < dropped because of buffer full. */ guint Drops; /* < number of packets that the driver dropped from the beginning of a capture. */ - /* < A packet is lost when the the buffer of the driver is full. */ + /* < A packet is lost when the driver's buffer is full. */ guint IfDrops; /* < Packets dropped by the card before going to the USB bus. */ /* < Not supported at the moment. */ guint Capt; /* < number of packets that pass the BPF filter, find place in the kernel buffer and */ @@ -717,7 +717,7 @@ gboolean AirpcapStoreCurConfigAsAdapterDefault(PAirpcapHandle AdapterHandle); \param Instructions pointer to the first BPF instruction in the array. Corresponds to the bf_insns in a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm). \param Len Number of instructions in the array pointed by the previous field. Corresponds to the bf_len in - a a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm). + a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm). \return TRUE on success. The AirPcap driver is able to perform kernel-level filtering using the standard BPF pseudo-machine format. You can read diff --git a/capture/airpcap_loader.c b/capture/airpcap_loader.c index 285014493e..5cae1ade31 100644 --- a/capture/airpcap_loader.c +++ b/capture/airpcap_loader.c @@ -1198,7 +1198,7 @@ get_compiled_airpcap_version(GString *str) } /* - * Append the version of AirPcap with which we we're running to a GString. + * Append the version of AirPcap with which we're running to a GString. */ void get_runtime_airpcap_version(GString *str) diff --git a/capture/capture-pcap-util-unix.c b/capture/capture-pcap-util-unix.c index 34207be74b..adf3084fe1 100644 --- a/capture/capture-pcap-util-unix.c +++ b/capture/capture-pcap-util-unix.c @@ -160,7 +160,7 @@ get_compiled_caplibs_version(GString *str) } /* - * Append the version of libpcap with which we we're running to a GString. + * Append the version of libpcap with which we're running to a GString. */ void get_runtime_caplibs_version(GString *str) diff --git a/capture/capture-wpcap.c b/capture/capture-wpcap.c index d92a670f95..84711faa4e 100644 --- a/capture/capture-wpcap.c +++ b/capture/capture-wpcap.c @@ -827,7 +827,7 @@ get_compiled_caplibs_version(GString *str) } /* - * Append the version of Npcap with which we we're running to a GString. + * Append the version of Npcap with which we're running to a GString. */ void get_runtime_caplibs_version(GString *str) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 62704a1ee4..f033cc02c8 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -201,7 +201,7 @@ if(PCAP_FOUND) set(HAVE_PCAP_SET_TSTAMP_TYPE TRUE) else(WIN32) # - # Make sure we have at least libpcap 0.8, because we we require at + # Make sure we have at least libpcap 0.8, because we require at # least libpcap 0.8's APIs. # # We check whether pcap_lib_version is defined in the pcap header, @@ -223,7 +223,7 @@ if(PCAP_FOUND) # remote capture support. # # However, 1) the sampling options are treated as remote options - # in the GUI and and 2) having pcap_setsampling() doesn't mean + # in the GUI and 2) having pcap_setsampling() doesn't mean # you have sampling support. libpcap needs a way to indicate # whether a given device supports sampling, and the GUI should # be changed to decouple them. diff --git a/doc/README.display_filter b/doc/README.display_filter index c266f1174f..1d7423be0e 100644 --- a/doc/README.display_filter +++ b/doc/README.display_filter @@ -160,7 +160,7 @@ operators ("==", "!=", "eq", "ne", etc.), it finds slice operations ( "[0:1]" ), quoted strings, IP addresses, numbers, and any other "special" keywords or string types. -Anything it doesn't know how to handle is passed to to grammar parser +Anything it doesn't know how to handle is passed to the grammar parser as an unparsed string (TOKEN_UNPARSED). This includes field names. The scanner does not interpret any protocol field names at all. diff --git a/doc/README.dissector b/doc/README.dissector index c3920350a2..d9c1845a8e 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -1103,7 +1103,7 @@ If the values in the array are not contiguous (ie: there are "gaps"), but are in ascending order a binary search will be used. Note: "gaps" in a value_string array can be filled with "empty" entries eg: -{value, "Unknown"} so that direct access to the array is is possible. +{value, "Unknown"} so that direct access to the array is possible. Note: the value_string array values are *unsigned*; IOW: -1 is greater than 0. So: diff --git a/doc/dumpcap.adoc b/doc/dumpcap.adoc index a9984f5b2d..39ce6976b2 100644 --- a/doc/dumpcap.adoc +++ b/doc/dumpcap.adoc @@ -282,7 +282,7 @@ interface or pipe specified before it with *-i*. --ifname> <name>:: + -- -Use __name__ as the name in the capture file for the the interface or +Use __name__ as the name in the capture file for the interface or pipe specified before it with *-i*. -- diff --git a/doc/packet-PROTOABBREV.c b/doc/packet-PROTOABBREV.c index e499a2abb8..31f697c83d 100644 --- a/doc/packet-PROTOABBREV.c +++ b/doc/packet-PROTOABBREV.c @@ -276,7 +276,7 @@ proto_register_PROTOABBREV(void) * should accommodate being called more than once by use of the static * 'initialized' variable included below. * - * This form of the reg_handoff function is used if if you perform registration + * This form of the reg_handoff function is used if you perform registration * functions which are dependent upon prefs. See below this function for a * simpler form which can be used if there are no prefs-dependent registration * functions. diff --git a/doc/tshark.adoc b/doc/tshark.adoc index 2305555692..29680f3361 100644 --- a/doc/tshark.adoc +++ b/doc/tshark.adoc @@ -87,7 +87,7 @@ Read filters use the same syntax as display and color filters in *Wireshark*; a read filter is specified with the *-R* option. Read filters can be specified when capturing or when reading from a -capture file. Note that that capture filters are much more efficient +capture file. Note that capture filters are much more efficient than read filters, and it may be more difficult for *TShark* to keep up with a busy network if a read filter is specified for a live capture, so you might be more likely to lose packets if you're using a read filter. diff --git a/docbook/wsdg_src/WSDG_chapter_sources.adoc b/docbook/wsdg_src/WSDG_chapter_sources.adoc index 4cacacd555..33a10864b8 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.adoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.adoc @@ -320,7 +320,7 @@ There are several reasons why you might want to change Wireshark’s sources: * Implement a glorious new feature Wireshark’s developers work on a variety of different platforms and use a variety of different development environments. -Although we we don't enforce or recommend a particular environment, your editor should support https://editorconfig.org/[EditorConfig] in order to make sure you pick up the correct indentation style for any files that you might edit. +Although we don't enforce or recommend a particular environment, your editor should support https://editorconfig.org/[EditorConfig] in order to make sure you pick up the correct indentation style for any files that you might edit. The internal structure of the Wireshark sources are described in <<PartDevelopment>>. diff --git a/docbook/wsug_src/WSUG_chapter_capture.adoc b/docbook/wsug_src/WSUG_chapter_capture.adoc index f745d5322c..faf0413407 100644 --- a/docbook/wsug_src/WSUG_chapter_capture.adoc +++ b/docbook/wsug_src/WSUG_chapter_capture.adoc @@ -114,7 +114,7 @@ If you are unsure which options to choose in this dialog box, leaving the defaul .The “Capture Options” input tab image::wsug_graphics/ws-capture-options.png[{screenshot-attrs}] -The “Input” tab contains the the “Interface” table, which shows the following columns: +The “Input” tab contains the “Interface” table, which shows the following columns: Interface:: The interface name. diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index eea047f16d..f1eeb44dbc 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -10,7 +10,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ /* The buffers returned by these functions are all allocated with a - * packet lifetime and does not have have to be freed. + * packet lifetime and does 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/epan/color_filters.h b/epan/color_filters.h index 1cc09bcb27..ca38d495b3 100644 --- a/epan/color_filters.h +++ b/epan/color_filters.h @@ -119,7 +119,7 @@ color_filters_colorize_packet(struct epan_dissect *edt); /** Clone the currently active filter list. * - * @param user_data will be returned by each call to to color_filter_add_cb() + * @param user_data will be returned by each call to color_filter_add_cb() * @param add_cb the callback function to add color filter */ WS_DLL_PUBLIC void color_filters_clone(gpointer user_data, color_filter_add_cb_func add_cb); @@ -127,7 +127,7 @@ WS_DLL_PUBLIC void color_filters_clone(gpointer user_data, color_filter_add_cb_f /** Load filters (import) from some other filter file. * * @param path the path to the import file - * @param user_data will be returned by each call to to color_filter_add_cb() + * @param user_data will be returned by each call to color_filter_add_cb() * @param err_msg a string with error message * @param add_cb the callback function to add color filter * @return TRUE, if read succeeded @@ -136,7 +136,7 @@ WS_DLL_PUBLIC gboolean color_filters_import(const gchar *path, gpointer user_dat /** Read filters from the global filter file (not the users file). * - * @param user_data will be returned by each call to to color_filter_add_cb() + * @param user_data will be returned by each call to color_filter_add_cb() * @param err_msg a string with error message * @param add_cb the callback function to add color filter * @return TRUE, if read succeeded diff --git a/epan/crypt/dot11decrypt.c b/epan/crypt/dot11decrypt.c index 2263a6b5bb..b4d625daf1 100644 --- a/epan/crypt/dot11decrypt.c +++ b/epan/crypt/dot11decrypt.c @@ -527,7 +527,7 @@ Dot11DecryptDecryptKeyData(PDOT11DECRYPT_CONTEXT ctx, * @param ctx [IN] pointer to the current context * @param id [IN] id of the association (composed by BSSID and MAC of * the station) - * @return a pointer the the requested SA. NULL if it doesn't exist. + * @return a pointer of the requested SA. NULL if it doesn't exist. */ static PDOT11DECRYPT_SEC_ASSOCIATION Dot11DecryptGetSa( diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 636eaedd39..f410d9140b 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -830,7 +830,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu case LDAP_REQ_COMPARE: case LDAP_REQ_EXTENDED: - /* this a a request - add it to the unmatched list */ + /* this a request - add it to the unmatched list */ /* check that we don't already have one of those in the unmatched list and if so remove it */ @@ -2097,7 +2097,7 @@ void proto_register_ldap(void) { { &hf_mscldap_netlogon_flags_fnc, { "FDC", "mscldap.netlogon.flags.forestnc", FT_BOOLEAN, 32, - TFS(&tfs_ads_fnc), 0x80000000, "Is the the NC the default forest root(Windows 2008)?", HFILL }}, + TFS(&tfs_ads_fnc), 0x80000000, "Is the NC the default forest root(Windows 2008)?", HFILL }}, { &hf_ldap_guid, { "GUID", "ldap.guid", FT_GUID, BASE_NONE, diff --git a/epan/dissectors/asn1/ranap/packet-ranap-template.c b/epan/dissectors/asn1/ranap/packet-ranap-template.c index 43789d8283..73c73ea299 100644 --- a/epan/dissectors/asn1/ranap/packet-ranap-template.c +++ b/epan/dissectors/asn1/ranap/packet-ranap-template.c @@ -99,7 +99,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/asn1/ros/packet-ros-template.c b/epan/dissectors/asn1/ros/packet-ros-template.c index 317dafaa6a..900a9a63c9 100644 --- a/epan/dissectors/asn1/ros/packet-ros-template.c +++ b/epan/dissectors/asn1/ros/packet-ros-template.c @@ -296,7 +296,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui /* we haven't found a match - try and match it up */ if(isInvoke) { - /* this a a request - add it to the unmatched list */ + /* this a request - add it to the unmatched list */ /* check that we don't already have one of those in the unmatched list and if so remove it */ diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.c b/epan/dissectors/asn1/tcap/packet-tcap-template.c index 121f23a904..b7a4bb1ce1 100644 --- a/epan/dissectors/asn1/tcap/packet-tcap-template.c +++ b/epan/dissectors/asn1/tcap/packet-tcap-template.c @@ -772,7 +772,7 @@ create_tcaphash_cont(struct tcaphash_cont_info_key_t *p_tcaphash_cont_key, if (p_tcaphash_contcall1) { /* Walk through list of transaction with identical keys */ - /* go the the end to insert new record */ + /* go to the end to insert new record */ do { if (!p_tcaphash_contcall1->next_contcall) { p_tcaphash_contcall=append_tcaphash_contcall(p_tcaphash_contcall1, @@ -801,7 +801,7 @@ create_tcaphash_end(struct tcaphash_end_info_key_t *p_tcaphash_end_key, if (p_tcaphash_endcall1) { /* Walk through list of transaction with identical keys */ - /* go the the end to insert new record */ + /* go to the end to insert new record */ do { if (!p_tcaphash_endcall1->next_endcall) { p_tcaphash_endcall=append_tcaphash_endcall(p_tcaphash_endcall1, diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c index 2f463c2d42..f945686518 100644 --- a/epan/dissectors/file-elf.c +++ b/epan/dissectors/file-elf.c @@ -2266,7 +2266,7 @@ proto_register_elf(void) { &hf_elf_eh_frame_fde_cie_pointer, { "CIE Pointer", "elf.eh_frame.fde.cie_pointer", FT_UINT32, BASE_DEC_HEX, NULL, 0x00, - "A 4 byte unsigned value that when subtracted from the offset of the the CIE Pointer in the current FDE yields the offset of the start of the associated CIE. This value shall never be 0.", HFILL } + "A 4 byte unsigned value that when subtracted from the offset of the CIE Pointer in the current FDE yields the offset of the start of the associated CIE. This value shall never be 0.", HFILL } }, { &hf_elf_eh_frame_fde_pc_begin, { "PC Begin", "elf.eh_frame.fde.pc_begin", diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index f6daa5c070..28e4d33431 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -1452,7 +1452,7 @@ afs_hash (gconstpointer v) * * "positive" and "negative" are integers which contain the number of * positive and negative ACL's in the string. The uid/aclbits pair are - * ASCII strings containing the UID/PTS record and and a ascii number + * ASCII strings containing the UID/PTS record and a ascii number * representing a logical OR of all the ACL permission bits */ /* diff --git a/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c index ad32c8d4dd..3f72de54c2 100644 --- a/epan/dissectors/packet-bpq.c +++ b/epan/dissectors/packet-bpq.c @@ -17,7 +17,7 @@ * Information was drawn from: * ? * - * It uses Ether ID 0x08ff which is not not officially registered. + * It uses Ether ID 0x08ff which is not officially registered. * */ diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 81fc878ecf..aa0b2886c8 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -701,7 +701,7 @@ dissect_bssap_cell_global_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo proto_tree_add_item(ie_tree, hf_bssap_plus_ie_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* - * The rest of the information element is coded as the the value part + * The rest of the information element is coded as the value part * of the cell global id IE defined in 3GPP TS 48.018 (not including * 3GPP TS 48.018 IEI and 3GPP TS 48.018 length indicator). */ @@ -1356,7 +1356,7 @@ dissect_bssap_service_area_id(tvbuff_t *tvb, proto_tree *tree, int offset) offset++; proto_tree_add_item(ie_tree, hf_bssap_plus_ie_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* The rest of the information element is coded as the the value part + /* The rest of the information element is coded as the value part * of the SAI IE defined in 3GPP TS 25.413 (not including * 3GPP TS 25.413 IEI and 3GPP TS 25.413 length indicator). */ diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c index 4eb7e57698..ea3ff052f3 100644 --- a/epan/dissectors/packet-dsr.c +++ b/epan/dissectors/packet-dsr.c @@ -295,7 +295,7 @@ dissect_dsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_dest, tvb, offset_in_option, 4, ENC_NA);/* Opt err unknown flow original ip destination address */ offset_in_option += 4; - proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN);/* Opt err unknown flow flow id */ + proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN);/* Opt err unknown flow id */ /*offset_in_option += 1;*/ break; case DSR_RERR_TYPE_DEFAULTFLOWUNKNOWN: diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 6a07774def..f35ffaab77 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -442,7 +442,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ * figure out what flavor of DTLS it is */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); - /* clear the the info column */ + /* clear the info column */ col_clear(pinfo->cinfo, COL_INFO); /* Create display subtree for SSL as a whole */ @@ -888,7 +888,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, /* * if we don't already have a version set for this conversation, * but this message's version is authoritative (i.e., it's - * not client_hello, then save the version to to conversation + * not client_hello, then save the version to the conversation * structure and print the column version */ next_byte = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 57fa063bef..e7ea7cc4d8 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -3371,7 +3371,7 @@ proto_register_eigrp(void) * @par * If this dissector uses sub-dissector registration add a registration routine. * - * This form of the reg_handoff function is used if if you perform registration + * This form of the reg_handoff function is used if you perform registration * functions which are dependent upon prefs. If this function is registered as * a prefs callback (see prefs_register_protocol above) this function is also * called by preferences whenever "Apply" is pressed; diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 708d055c3d..149d185aff 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -1176,7 +1176,7 @@ static const guint8 fileinfomagic1[] = { * * The analysis in this dissector is meant to correlate data in the F5 Ethernet trailer with other * data in the frame (e.g. IP, TCP) and highlight things that don't look right. They might be - * perfectly valid, but in most cases, they are are not. + * perfectly valid, but in most cases, they are not. * * How it works: * @@ -1624,7 +1624,7 @@ render_f5_legacy_hdr(tvbuff_t *tvb, proto_tree *tree, gint offset) * @param tvb Pointer to the tvb to be processed * @param pinfo Pointer to packet_info struct * @param tree Pointer to protocol tree - * @param offset Offset int the the tvb where trailer begins + * @param offset Offset into the tvb where trailer begins * @param trailer_length Length of the trailer data to process * @param trailer_ver Version of the trailer detected * @param tdata Pointer to tap data structure @@ -1737,7 +1737,7 @@ dissect_high_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint * @param tvb Pointer to the tvb to be processed * @param pinfo Pointer to packet_info struct * @param tree Pointer to protocol tree - * @param offset Offset int the the tvb where trailer begins + * @param offset Offset into the tvb where trailer begins * @param trailer_length Length of the trailer data to process * @param trailer_ver Version of the trailer detected * @param tdata Pointer to tap data structure @@ -1944,7 +1944,7 @@ dissect_med_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint o * @param tvb Pointer to the tvb to be processed * @param pinfo Pointer to packet_info struct * @param tree Pointer to protocol tree - * @param offset Offset int the the tvb where trailer begins + * @param offset Offset into the tvb where trailer begins * @param trailer_length Length of the trailer data to process * @param trailer_ver Version of the trailer detected * @param tdata Pointer to tap data structure diff --git a/epan/dissectors/packet-ftdi-mpsse.c b/epan/dissectors/packet-ftdi-mpsse.c index 838ef2f1b6..2f1ecc213f 100644 --- a/epan/dissectors/packet-ftdi-mpsse.c +++ b/epan/dissectors/packet-ftdi-mpsse.c @@ -110,7 +110,7 @@ static dissector_handle_t ftdi_mpsse_handle; * not have is_response_set flag set, is added to rx_command_info with the current packet number in the key. * * After first pass, RX packets always obtain relevant command_data_t entry without traversing the list. - * If there wasn't a separate tree TX packets (tx_command_info), TX packet dissection would have to to + * If there wasn't a separate tree TX packets (tx_command_info), TX packet dissection would have to * traverse the list from the pointer obtained from rx_command_info. In normal conditions the number of * entries to skip in such case is low. However, when the capture file has either: * * A lot of TX packets with commands expecting response but no RX packets, or diff --git a/epan/dissectors/packet-gfp.c b/epan/dissectors/packet-gfp.c index 4714c592fd..90192b2705 100644 --- a/epan/dissectors/packet-gfp.c +++ b/epan/dissectors/packet-gfp.c @@ -582,7 +582,7 @@ proto_register_gfp(void) * should accommodate being called more than once by use of the static * 'initialized' variable included below. * - * This form of the reg_handoff function is used if if you perform registration + * This form of the reg_handoff function is used if you perform registration * functions which are dependent upon prefs. */ void diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index b85893e8d3..fb820bb108 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -3120,7 +3120,7 @@ void get_CDR_interface(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int /* Copy a 4 octet sequence from the tvbuff * which represents a signed long value, and convert - * it to an signed long vaule, taking into account byte order. + * it to an signed long value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment * boundary for long values. * offset is then incremented by 4, to indicate the 4 octets which @@ -3144,7 +3144,7 @@ gint32 get_CDR_long(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, i /* Copy a 8 octet sequence from the tvbuff * which represents a signed long long value, and convert - * it to an signed long long vaule, taking into account byte order. + * it to an signed long long value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment * boundary for long long values. * offset is then incremented by 8, to indicate the 8 octets which @@ -3489,7 +3489,7 @@ guint32 get_CDR_ulong(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, /* Copy a 8 octet sequence from the tvbuff * which represents an unsigned long long value, and convert - * it to an unsigned long long vaule, taking into account byte order. + * it to an unsigned long long value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment * boundary for unsigned long long values. * offset is then incremented by 4, to indicate the 4 octets which @@ -5806,7 +5806,7 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre } /* - * Now see if if it's v1.1 or 1.2, as they can contain + * Now see if it's v1.1 or 1.2, as they can contain * extra sequence of IOP::TaggedComponents * */ diff --git a/epan/dissectors/packet-gquic.c b/epan/dissectors/packet-gquic.c index 611dfa2c99..e7d4919e09 100644 --- a/epan/dissectors/packet-gquic.c +++ b/epan/dissectors/packet-gquic.c @@ -2832,7 +2832,7 @@ proto_register_gquic(void) "Specifying the number of missing packet ranges between largest observed and least unacked", HFILL } }, { &hf_gquic_frame_type_ack_missing_packet, - { "Missing Packet Packet Number Delta", "gquic.frame_type.ack.missing_packet", + { "Missing Packet Number Delta", "gquic.frame_type.ack.missing_packet", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -2847,7 +2847,7 @@ proto_register_gquic(void) "Specifying the number of revived packets, recovered via FEC", HFILL } }, { &hf_gquic_frame_type_ack_revived_packet, - { "Revived Packet Packet Number", "gquic.frame_type.ack.revived_packet", + { "Revived Packet Number", "gquic.frame_type.ack.revived_packet", FT_UINT64, BASE_DEC, NULL, 0x0, "Representing a packet the peer has revived via FEC", HFILL } }, diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 120bd3cf35..a513fec109 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -1429,7 +1429,7 @@ static const range_string gsm_a_bssap_channel_rate_and_type_rvals[] = { { 0x1a, 0x1a, "Full or Half rate TCH channel, Full rate preferred, changes allowed also after first channel allocation as a result of the request" }, { 0x1b, 0x1b, "Full or Half rate TCH channel, Half rate preferred, changes allowed also after first channel allocation as a result of the request" }, { 0x1c, 0x1f, "Reserved" }, - { 0x20, 0x27, "Full rate TCH channels in a multislot configuration, changes by the BSS of the the number of TCHs and if applicable the used radio interface rate per channel allowed after first channel allocation as a result of the request" }, + { 0x20, 0x27, "Full rate TCH channels in a multislot configuration, changes by the BSS of the number of TCHs and if applicable the used radio interface rate per channel allowed after first channel allocation as a result of the request" }, { 0x28, 0x2f, "Reserved" }, { 0x30, 0x37, "Full rate TCH channels in a multislot configuration, changes by the BSS of the number of TCHs or the used radio interface rate per channel not allowed after first channel allocation as a result of the request" }, { 0x38, 0xff, "Reserved" }, diff --git a/epan/dissectors/packet-gsm_rlcmac.h b/epan/dissectors/packet-gsm_rlcmac.h index da91f3fed6..e70b7f57ec 100644 --- a/epan/dissectors/packet-gsm_rlcmac.h +++ b/epan/dissectors/packet-gsm_rlcmac.h @@ -4671,7 +4671,7 @@ typedef struct guint8 MESSAGE_TYPE; guint8 PAGE_MODE; - PacketDownlinkID_t ID; /* use the PDA ID as it is the same as as the PMO */ + PacketDownlinkID_t ID; /* use the PDA ID as it is the same as the PMO */ guint8 PMO_INDEX; guint8 PMO_COUNT; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index faca4a4f83..00d755d249 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -6216,7 +6216,7 @@ decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * * UMTS: 3GPP TS 29.060 version 10.4.0 Release 10, chapter 7.7.37 * Type = 138 (Decimal) * 25.413(RANAP) TargetID - * There are several CRs to to this IE make sure to check with a recent spec if dissection is questioned. + * There are several CRs to this IE make sure to check with a recent spec if dissection is questioned. */ static int decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_) diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 1a8beba704..319bb01856 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -5878,7 +5878,7 @@ dissect_gtpv2_source_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case 1: /* The Source Type is RNC ID for PS handover from GERAN Iu mode or for inter-RAT handover from UTRAN. In this - * case the Source ID field shall be encoded as as the Source RNC-ID part of the "Source ID" parameter in 3GPP TS + * case the Source ID field shall be encoded as the Source RNC-ID part of the "Source ID" parameter in 3GPP TS * 25.413 [33]. */ /* RNC-ID M INTEGER (0..4095) */ diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c index 398b93547a..0daabdfbe5 100644 --- a/epan/dissectors/packet-hl7.c +++ b/epan/dissectors/packet-hl7.c @@ -124,7 +124,7 @@ static const string_string hl7_msg_type_vals[] = { { "ORM", "Pharmacy/treatment order" }, { "ORN", "Non-stock requisition - General order acknowledgment" }, { "ORP", "Pharmacy/treatment order acknowledgment" }, - { "ORR", "General order response response to any ORM" }, + { "ORR", "General order response message response to any ORM" }, { "ORS", "Stock requisition - Order acknowledgment" }, { "ORU", "Unsolicited transmission of an observation" }, { "OSQ", "Query response for order status" }, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index fd4a23a14b..073d19686f 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -19196,7 +19196,7 @@ static guint16 determine_mic_len(packet_info *pinfo, gboolean assoc_frame, conversation_data->last_akm_suite_set) { /* 3rd - Use AKMS negotiated during association to determine MIC length */ if (conversation_data->last_akm_suite == AKMS_OWE) { - /* For OWE the the length of MIC depends on the selected group */ + /* For OWE the length of MIC depends on the selected group */ eapol_key_mic_len = get_mic_len_owe(conversation_data->owe_group); } else { @@ -19206,7 +19206,7 @@ static guint16 determine_mic_len(packet_info *pinfo, gboolean assoc_frame, else if (packet_data && packet_data->last_akm_suite_set) { /* 3rd - Use AKMS from current packet to determine MIC length */ if (packet_data->last_akm_suite == AKMS_OWE) { - /* For OWE the the length of MIC depends on the selected group */ + /* For OWE the length of MIC depends on the selected group */ eapol_key_mic_len = get_mic_len_owe(packet_data->owe_group); } else { @@ -34099,7 +34099,7 @@ dissect_ieee80211_pv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_tk, tvb, 0, 0, out_buff); proto_item_set_generated(ti); - /* Also add the PMK used to to decrypt the packet. (PMK==PSK) */ + /* Also add the PMK used to decrypt the packet. (PMK==PSK) */ if (used_key.KeyData.Wpa.PskLen > 0) { bytes_to_hexstr(out_buff, used_key.KeyData.Wpa.Psk, used_key.KeyData.Wpa.PskLen); @@ -34182,7 +34182,7 @@ dissect_ieee80211_pv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * We have the entire packet, and it includes a 4-byte ICV. * Slice it off, and put it into the tree. * - * We only support decrypting if we have the the ICV. + * We only support decrypting if we have the ICV. * * XXX - the ICV is encrypted; we're putting the encrypted * value, not the decrypted value, into the tree. @@ -35441,7 +35441,7 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_ padding_len, ENC_NA); } } - /* Also add the PTK used to to decrypt and validate the keydata. */ + /* Also add the PTK used to decrypt and validate the keydata. */ add_ptk_analysis(tvb, keydes_tree, &eapol->used_key); } } else { diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 09f4af6975..b51456685f 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1181,7 +1181,7 @@ dissect_ipopt_route(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int pro dissect_option_route(field_tree, tvb, offset + optoffset, hf_ip_rec_rt, hf_ip_rec_rt_host, FALSE); } else if (optoffset == (len - 4)) { - /* This is the the destination */ + /* This is the destination */ proto_item *item; guint32 addr; const char *dst_host; diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c index 94c77493fa..aef22466e9 100644 --- a/epan/dissectors/packet-kt.c +++ b/epan/dissectors/packet-kt.c @@ -35,7 +35,7 @@ static int proto_kt = -1; * for which it has been written, the way it has been written makes * dissection a bit tricky. Requests and responses have the same * "magic" identifier, but there is no clear cut way to distinguish - * between them. This means that a few dirty tricks have have to be + * between them. This means that a few dirty tricks have to be * employed for dissecting... and the dissector is based on sample * captures from two different clients working with the same version * of the server. diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 0b189d30ff..d7fd6a3073 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1044,7 +1044,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu case LDAP_REQ_COMPARE: case LDAP_REQ_EXTENDED: - /* this a a request - add it to the unmatched list */ + /* this is a request - add it to the unmatched list */ /* check that we don't already have one of those in the unmatched list and if so remove it */ @@ -5007,7 +5007,7 @@ void proto_register_ldap(void) { { &hf_mscldap_netlogon_flags_fnc, { "FDC", "mscldap.netlogon.flags.forestnc", FT_BOOLEAN, 32, - TFS(&tfs_ads_fnc), 0x80000000, "Is the the NC the default forest root(Windows 2008)?", HFILL }}, + TFS(&tfs_ads_fnc), 0x80000000, "Is the NC the default forest root(Windows 2008)?", HFILL }}, { &hf_ldap_guid, { "GUID", "ldap.guid", FT_GUID, BASE_NONE, diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 56f742a73f..5e60f36515 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -999,7 +999,7 @@ nextcontext: /* Find Commands */ - /* If Transaction is is Request, Reply or Pending */ + /* If Transaction is Request, Reply or Pending */ tvb_command_start_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1); tvb_command_end_offset = tvb_command_start_offset; diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c index 1bd5b8192f..62c7af7d0b 100644 --- a/epan/dissectors/packet-metamako.c +++ b/epan/dissectors/packet-metamako.c @@ -143,8 +143,8 @@ dissect_metamako(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Loop through the trailer bytes, try to find a valid trailer. * Only try twice: - * - First try the case there there IS NO trailing FCS - * - Second try the case where where IS a trailing FCS + * - First try the case where IS NO trailing FCS + * - Second try the case where there IS a trailing FCS */ for ( i = 0; i < 2 && metamako_trailer_bytes >= 12 && !trailer_valid; i++ ) { /* Start at the tail of the trailer and work inwards */ diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 460690b2d5..1527e53b21 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -237,7 +237,7 @@ static int hf_mpeg_descr_audio_stream_reserved = -1; static const value_string mpeg_descr_audio_stream_free_format_flag_vals[] = { { 0x00, "bitrate_index is not 0" }, - { 0x01, "One more more audio frame has bitrate_index = 0" }, + { 0x01, "One or more audio frame has bitrate_index = 0" }, { 0x00, NULL } }; diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index db0053b54e..d07c0e2994 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -984,7 +984,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* if there is no per packet data -> create it */ if (mtp2_ppd == NULL) { mtp2_ppd = wmem_new(wmem_file_scope(), mtp2_ppd_t); - /* set the the proto_data_fields + /* set the proto_data_fields * because these are the values which we would like to see * if this packet is seen again */ if (dir_state == FORWARD) { diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index bc5600fd2f..248b7ff091 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -18081,7 +18081,7 @@ proto_register_netflow(void) /* ixia, 3054 / 176 */ {&hf_pie_ixia_reverse_octet_delta_count, - {"Reverse octet octet count", "cflow.pie.ixia.reverse-octet-delta-count", + {"Reverse octet delta count", "cflow.pie.ixia.reverse-octet-delta-count", FT_UINT64, BASE_DEC, NULL, 0x0, "In bi-directional flows, byte count for the server back to client", HFILL} }, diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 5d79520d5c..2c61c6b329 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2518,7 +2518,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, /*if (!(NTLMSSP_NEGOTIATE_KEY_EXCH & packet_ntlmssp_info->flags)) {*/ if (conv_ntlmssp_info->flags & NTLMSSP_NEGOTIATE_EXTENDED_SECURITY) { if ((NTLMSSP_NEGOTIATE_KEY_EXCH & conv_ntlmssp_info->flags)) { - /* The spec says that if we have have a key exchange then we have a the signature that is crypted + /* The spec says that if we have a key exchange then we have the signature that is crypted * otherwise it's just a hmac_md5(keysign, concat(message, sequence))[0..7] */ if (gcry_cipher_decrypt(rc4_handle, packet_ntlmssp_info->verifier, 8, NULL, 0)) { diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 95d49baeb3..5c03716a97 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -350,7 +350,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui /* we haven't found a match - try and match it up */ if(isInvoke) { - /* this a a request - add it to the unmatched list */ + /* this is a request - add it to the unmatched list */ /* check that we don't already have one of those in the unmatched list and if so remove it */ diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 1c29db646b..8f5a8e29a1 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -1499,7 +1499,7 @@ static const value_string szl_bart_sch_names[] = { }; static gint hf_s7comm_szl_0132_0004_crst_wrst = -1; static const value_string szl_crst_wrst_names[] = { - { 0, "undefined, does not exist or cannot be be ascertained" }, + { 0, "undefined, does not exist or cannot be ascertained" }, { 1, "CRST" }, { 2, "WRST" }, { 0, NULL } @@ -3598,7 +3598,7 @@ s7comm_decode_szl_id_0131_idx_0006(tvbuff_t *tvb, * Index: 0x0007 * Content: * The partial list extract with SZL-ID W#16#0131 and the index W#16#0007 - * contains information about the functions available available for global data + * contains information about the functions available for global data * communication on the module. * *******************************************************************************************************/ diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index a57ce7af4b..0027181f63 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -1017,7 +1017,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ switch (sbus_cmd_code){ case SBUS_WEB_SERVER_SERIAL_COMM: /* Special treatment of web server request - * as is is very helpful to see more information in the packetlist */ + * as this is very helpful to see more information in the packetlist */ sbus_web_aid = tvb_get_guint8(tvb, 12); sbus_web_seq = tvb_get_guint8(tvb, 13); col_add_fstr(pinfo->cinfo, COL_INFO, @@ -1095,7 +1095,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ case SBUS_RESPONSE: /* Special treatment of web server request - * as is is very helpful to see more information in the packetlist */ + * as this is very helpful to see more information in the packetlist */ if (request_val && ((request_val->cmd_code) == SBUS_WEB_SERVER_SERIAL_COMM)) { sbus_web_size = tvb_get_guint8(tvb,9); sbus_web_aid = tvb_get_guint8(tvb,10); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 2954a1e81d..6f8e971692 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -11692,7 +11692,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "File system specific parameter block". (That means * we may not be able to dissect it in any case.) */ @@ -11703,7 +11703,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "Device/function specific parameter block". (That * means we may not be able to dissect it in any case.) */ @@ -14028,7 +14028,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "File system specific data block". (That means we * may not be able to dissect it in any case.) */ @@ -14039,7 +14039,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "Device/function specific data block". (That * means we may not be able to dissect it in any case.) */ @@ -14050,7 +14050,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains "additional + * July 19, 1990" says this contains "additional * level dependent match data". */ break; @@ -14060,7 +14060,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains "additional + * July 19, 1990" says this contains "additional * level dependent monitor information". */ break; @@ -16468,7 +16468,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "File system specific return data block". * (That means we may not be able to dissect it in any * case.) @@ -16480,7 +16480,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "Device/function specific return data block". * (That means we may not be able to dissect it in any * case.) @@ -16492,7 +16492,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains "the level + * July 19, 1990" says this contains "the level * dependent information about the changes which * occurred". */ @@ -16503,7 +16503,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains "the level + * July 19, 1990" says this contains "the level * dependent information about the changes which * occurred". */ @@ -16715,7 +16715,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "File system specific return parameter block". * (That means we may not be able to dissect it in any * case.) @@ -16727,7 +16727,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot /* * XXX - "Microsoft Networks SMB File Sharing Protocol * Extensions Version 3.0, Document Version 1.11, - * July 19, 1990" says this this contains a + * July 19, 1990" says this contains a * "Device/function specific return parameter block". * (That means we may not be able to dissect it in any * case.) diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 73adbccfdd..9b7a240c6d 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -9018,7 +9018,7 @@ dissect_smb2_create_extra_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa /* * These things are all either 4-char strings, like DH2C, or GUIDs, * however, at least one of them appears to be a GUID as a string and - * one appears to be a binary guid. So, check if the the length is + * one appears to be a binary guid. So, check if the length is * 16, and if so, pull the GUID and convert it to a string. Otherwise * call dissect_smb2_olb_string. */ diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c index b5cac046a3..8fa41c99c0 100644 --- a/epan/dissectors/packet-sndcp-xid.c +++ b/epan/dissectors/packet-sndcp-xid.c @@ -54,7 +54,7 @@ typedef struct */ static int proto_sndcp_xid = -1; -/* These fields are used to store store the algorithm ID +/* These fields are used to store the algorithm ID * When the P bit is not set, try to decode the algo based on what whas stored. * Entity ranges from 0 to 31 (6.5.1.1.3) */ diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 87e543c581..b17212155d 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -674,8 +674,8 @@ static const value_string sprt_prof_xchg_support[] = { static const range_string sprt_payload_dlci1[] = { { SPRT_VALUE_RANGE(SPRT_PAYLOAD_DLCI1_DTE2DTE), "DTE-to-DTE (V.24 interfaces) data" }, - { SPRT_PAYLOAD_DLCI1_RESERVED_START, SPRT_PAYLOAD_DLCI1_RESERVED_END, "Reserved for for ITU-T" }, - { SPRT_PAYLOAD_DLCI1_NOT_RESERVED_START, SPRT_PAYLOAD_DLCI1_NOT_RESERVED_END, "Not reserved for for ITU-T" }, + { SPRT_PAYLOAD_DLCI1_RESERVED_START, SPRT_PAYLOAD_DLCI1_RESERVED_END, "Reserved for ITU-T" }, + { SPRT_PAYLOAD_DLCI1_NOT_RESERVED_START, SPRT_PAYLOAD_DLCI1_NOT_RESERVED_END, "Not reserved for ITU-T" }, { SPRT_VALUE_RANGE(SPRT_PAYLOAD_DLCI1_CTRLFN2CTRLFN), "Control-function to control-function information" }, { 0, 0, NULL } }; diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index e01e79527c..750513ade1 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -1097,7 +1097,7 @@ dissect_receive_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p static const value_string interworking_values[] = { { 0x0, "No Interworking with SS7 Networks" }, - { 0x1, "IP-Signalling Endpoint interworking with with SS7 networks" }, + { 0x1, "IP-Signalling Endpoint interworking with SS7 networks" }, { 0x2, "Signalling Gateway" }, { 0x3, "Relay Node Support" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 75f2a57540..8939ed0c8c 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -2064,7 +2064,7 @@ create_tcaphash_cont(struct tcaphash_cont_info_key_t *p_tcaphash_cont_key, if (p_tcaphash_contcall1) { /* Walk through list of transaction with identical keys */ - /* go the the end to insert new record */ + /* go to the end to insert new record */ do { if (!p_tcaphash_contcall1->next_contcall) { p_tcaphash_contcall=append_tcaphash_contcall(p_tcaphash_contcall1, @@ -2093,7 +2093,7 @@ create_tcaphash_end(struct tcaphash_end_info_key_t *p_tcaphash_end_key, if (p_tcaphash_endcall1) { /* Walk through list of transaction with identical keys */ - /* go the the end to insert new record */ + /* go to the end to insert new record */ do { if (!p_tcaphash_endcall1->next_endcall) { p_tcaphash_endcall=append_tcaphash_endcall(p_tcaphash_endcall1, diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 9705449f08..eb862c462a 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1044,7 +1044,7 @@ typedef struct tcp_follow_tap_data * dummy data to mark packet loss if any). * * Returns TRUE if one fragment has been applied or FALSE if no more fragments - * can be added the the payload (there might still be unacked fragments with + * can be added to the payload (there might still be unacked fragments with * missing segments before them). */ static gboolean @@ -3387,7 +3387,7 @@ again: * The next TCP_A_RETRANSMISSION hopefully takes care of it though. * * Only shortcircuit here when the first segment of the MSP is known, - * and when this this first segment is not one to complete the MSP. + * and when this first segment is not one to complete the MSP. */ if ((msp = (struct tcp_multisegment_pdu *)wmem_tree_lookup32(tcpd->fwd->multisegment_pdus, seq)) && nxtseq <= msp->nxtpdu && @@ -6311,7 +6311,7 @@ decode_tcp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, 1) we pick the same dissector for traffic going in both directions; 2) we prefer the port number that's more likely to be the right - one (as that prefers prefers well-known ports to reserved ports); + one (as that prefers well-known ports to reserved ports); although there is, of course, no guarantee that any such strategy will always pick the right port number. diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 0d170d866e..4d267d6645 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -668,7 +668,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) * throw an exception before we get the chance to do so). */ col_set_str(pinfo->cinfo, COL_PROTOCOL, val_to_str_const(session->version, ssl_version_short_names, "SSL")); - /* clear the the info column */ + /* clear the info column */ col_clear(pinfo->cinfo, COL_INFO); /* TCP packets and TLS records are orthogonal. @@ -1900,7 +1900,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, /* * if we don't already have a version set for this conversation, * but this message's version is authoritative (i.e., it's - * not client_hello, then save the version to to conversation + * not client_hello, then save the version to the conversation * structure and print the column version. If the message is not authorative * (i.e. it is a Client Hello), then this version will still be used for * display purposes only (it will not be stored in the conversation). diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 9fa3602bca..9ac02fa8cf 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -5314,7 +5314,7 @@ heur_dissect_fp_unknown_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } /* The CRC is correct! */ - /* Attaching 'FP Conversation Info' the the UDP conversation so other */ + /* Attaching 'FP Conversation Info' to the UDP conversation so other */ /* packets (both Control AND Data) will be marked as FP */ umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t); umts_fp_conversation_info->channel = CHANNEL_UNKNOWN; diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c index 5ad55be5f0..cc935a532b 100644 --- a/epan/dissectors/packet-usbll.c +++ b/epan/dissectors/packet-usbll.c @@ -1475,7 +1475,7 @@ dissect_usbll_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs transfer->more_frags = FALSE; /* Expect requested_length when reading from control endpoint. * The data should start with DATA1. If we receive DATA0 then - * is is really device failure. + * this is really device failure. */ ep_in->requested_transfer_length = requested_length; ep_in->last_data_pid = pid; diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 09dae0a775..22a56120f9 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -759,7 +759,7 @@ test_websocket(packet_info* pinfo _U_, tvbuff_t* tvb, int offset _U_, void* data guint8 op_code = first_byte & 0x0F; - // op_code must be one one of WS_CONTINUE, WS_TEXT, WS_BINARY, WS_CLOSE, WS_PING or WS_PONG + // op_code must be one of WS_CONTINUE, WS_TEXT, WS_BINARY, WS_CLOSE, WS_PING or WS_PONG if (!(op_code == WS_CONTINUE || op_code == WS_TEXT || op_code == WS_BINARY || op_code == WS_CLOSE || op_code == WS_PING || op_code == WS_PONG)) { return FALSE; diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 3c09f98f34..7646aff824 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -1129,7 +1129,7 @@ zbee_sec_hash(guint8 *input, guint input_len, guint8 *output) * append the byte 0x80. */ cipher_in[j++] = 0x80; - /* Pad with '0' until the the current block is exactly 'n' bits from the + /* Pad with '0' until the current block is exactly 'n' bits from the * end. */ while (j!=(ZBEE_SEC_CONST_BLOCKSIZE-2)) { diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 15a1a5b027..7da4d1903b 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -715,7 +715,7 @@ zdp_parse_server_flags(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *of } /* zdp_parse_server_flags */ /** - *Parses and displays a node descriptor to the the specified + *Parses and displays a node descriptor to the specified * *@param tree pointer to data tree Wireshark uses to display packet. *@param ettindex subtree index to create the node descriptor in, or -1 @@ -820,7 +820,7 @@ static const value_string zbee_zdp_power_level_vals[] = { { 0, NULL } }; /** - *Parses and displays a node descriptor to the the specified + *Parses and displays a node descriptor to the specified * *@param tree pointer to data tree Wireshark uses to display packet. *@param ettindex subtree index to create the node descriptor in, or -1 @@ -847,7 +847,7 @@ zdp_parse_power_desc(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offs } /* zdp_parse_power_desc */ /** - *Parses and displays a simple descriptor to the the specified + *Parses and displays a simple descriptor to the specified * *@param tree pointer to data tree Wireshark uses to display packet. *@param ettindex subtree index to create the node descriptor in, or -1 @@ -919,7 +919,7 @@ zdp_parse_simple_desc(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *off } /* zdp_parse_simple_desc */ /** - *Parses and displays a simple descriptor to the the specified + *Parses and displays a simple descriptor to the specified * *@param tree pointer to data tree Wireshark uses to display packet. *@param ettindex subtree index to create the node descriptor in, or -1 diff --git a/epan/next_tvb.h b/epan/next_tvb.h index fe4cd25af0..35e2327464 100644 --- a/epan/next_tvb.h +++ b/epan/next_tvb.h @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ /* The buffers returned by these functions are all allocated with a - * packet lifetime or are static buffers and does not have have to be freed. + * packet lifetime or are static buffers and does 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/epan/params.h b/epan/params.h index 8ccf8615b5..802d9e351e 100644 --- a/epan/params.h +++ b/epan/params.h @@ -15,7 +15,7 @@ /* * Definition of a value for an enumerated type. * - * "name" is the the name one would use on the command line for the value. + * "name" is the name one would use on the command line for the value. * "description" is the description of the value, used in combo boxes/ * option menus. * "value" is the value. diff --git a/epan/proto.c b/epan/proto.c index fea8dc4988..162cafdda4 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -11134,7 +11134,7 @@ proto_registrar_dump_elastic(const gchar* filter) * Field 1 = 'F' * Field 2 = descriptive field name * Field 3 = field abbreviation - * Field 4 = type ( textual representation of the the ftenum type ) + * Field 4 = type ( textual representation of the ftenum type ) * Field 5 = parent protocol abbreviation * Field 6 = base for display (for integer types); "parent bitfield width" for FT_BOOLEAN * Field 7 = bitmask: format: hex: 0x.... diff --git a/epan/reassemble.h b/epan/reassemble.h index 9d85443cef..18613a63f8 100644 --- a/epan/reassemble.h +++ b/epan/reassemble.h @@ -218,7 +218,7 @@ fragment_add_multiple_ok(reassembly_table *table, tvbuff_t *tvb, * If the packet was seen before, return the head of the fully reassembled * fragments list (NULL if there was none). * - * Otherwise (if reassembly was not possible before), try to to add the new + * Otherwise (if reassembly was not possible before), try to add the new * fragment to the fragments table. If reassembly is now possible, remove all * (reassembled) fragments from the fragments table and store it as a completed * reassembly. The head of this reassembled fragments list is returned. diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index 39950c68e2..3568f656a9 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -1687,7 +1687,7 @@ test_fragment_add_partial_reassembly(void) ASSERT_EQ(1,fd_head->frame); /* max frame in reassembly */ ASSERT_EQ(0,fd_head->offset); /* unused */ ASSERT_EQ(0,fd_head->len); /* unused */ - ASSERT_EQ(50,fd_head->datalen); /* the length of data we we have */ + ASSERT_EQ(50,fd_head->datalen); /* the length of data we have */ ASSERT_EQ(1,fd_head->reassembled_in); ASSERT_EQ(FD_DEFRAGMENTED|FD_DATALEN_SET,fd_head->flags); ASSERT_NE_POINTER(NULL,fd_head->tvb_data); @@ -2567,7 +2567,7 @@ test_fragment_add_check_partial_reassembly(void) ASSERT_EQ(1,fd_head->frame); /* max frame in reassembly */ ASSERT_EQ(0,fd_head->offset); /* unused */ ASSERT_EQ(0,fd_head->len); /* unused */ - ASSERT_EQ(50,fd_head->datalen); /* the length of data we we have */ + ASSERT_EQ(50,fd_head->datalen); /* the length of data we have */ ASSERT_EQ(1,fd_head->reassembled_in); ASSERT_EQ(FD_DEFRAGMENTED|FD_DATALEN_SET,fd_head->flags); ASSERT_NE_POINTER(NULL,fd_head->tvb_data); diff --git a/epan/sequence_analysis.c b/epan/sequence_analysis.c index ced0c99194..7842754329 100644 --- a/epan/sequence_analysis.c +++ b/epan/sequence_analysis.c @@ -1,7 +1,7 @@ /* sequence-analysis.c * Flow sequence analysis * - * Some code from from gtk/flow_graph.c + * Some code from gtk/flow_graph.c * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/strutil.c b/epan/strutil.c index 072ce46cbe..411ecdec96 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -1115,7 +1115,7 @@ convert_string_to_hex(const char *string, size_t *nbytes) } /* - * Copy if if it's a case-sensitive search; uppercase it if it's + * Copy if it's a case-sensitive search; uppercase it if it's * a case-insensitive search. */ char * diff --git a/epan/tvbparse.h b/epan/tvbparse.h index ecf76f3133..2bc23fd87a 100644 --- a/epan/tvbparse.h +++ b/epan/tvbparse.h @@ -178,7 +178,7 @@ struct _tvbparse_elem_t { * a char element. * * When looked for it returns a simple element one character long if the char - * at the current offset matches one of the the needles. + * at the current offset matches one of the needles. */ WS_DLL_PUBLIC tvbparse_wanted_t* tvbparse_char(const int id, @@ -191,7 +191,7 @@ tvbparse_wanted_t* tvbparse_char(const int id, * a not_char element. * * When looked for it returns a simple element one character long if the char - * at the current offset does not match one of the the needles. + * at the current offset does not match one of the needles. */ WS_DLL_PUBLIC tvbparse_wanted_t* tvbparse_not_char(const int id, diff --git a/epan/value_string.c b/epan/value_string.c index 34bcc3b107..841eed789f 100644 --- a/epan/value_string.c +++ b/epan/value_string.c @@ -213,7 +213,7 @@ str_to_val_idx(const gchar *val, const value_string *vs) * using (if possible) direct access or a binary search of the array. * * If the values in the value_string array are a contiguous range of values - * from min to max, the value will be used as as a direct index into the array. + * from min to max, the value will be used as a direct index into the array. * * If the values in the array are not contiguous (ie: there are "gaps"), * but are in assending order a binary search will be used. @@ -498,7 +498,7 @@ _try_val_to_str_ext_init(const guint32 val, value_string_ext *vse) * using (if possible) direct access or a binary search of the array. * * If the values in the val64_string array are a contiguous range of values - * from min to max, the value will be used as as a direct index into the array. + * from min to max, the value will be used as a direct index into the array. * * If the values in the array are not contiguous (ie: there are "gaps"), * but are in assending order a binary search will be used. diff --git a/epan/wscbor.h b/epan/wscbor.h index eafba3a0c3..0d3e9f8da2 100644 --- a/epan/wscbor.h +++ b/epan/wscbor.h @@ -95,7 +95,7 @@ typedef struct { /// The start offset of this chunk gint start; - /// The length of just this header any any preceding tags + /// The length of just this header and any preceding tags gint head_length; /// The length of this chunk and its immediate definite data (i.e. strings) gint data_length; diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c index c8b5c0dd9c..ccb250b764 100644 --- a/extcap/ciscodump.c +++ b/extcap/ciscodump.c @@ -580,7 +580,7 @@ int main(int argc, char *argv[]) "If not specified, ssh-agent and ssh-key are used"); extcap_help_add_option(extcap_conf, "--sshkey <public key path>", "the path of the ssh key"); extcap_help_add_option(extcap_conf, "--sshkey-passphrase <public key passphrase>", "the passphrase to unlock public ssh"); - extcap_help_add_option(extcap_conf, "--proxycommand <proxy command>", "the command to use as proxy the the ssh connection"); + extcap_help_add_option(extcap_conf, "--proxycommand <proxy command>", "the command to use as proxy for the ssh connection"); extcap_help_add_option(extcap_conf, "--remote-interface <iface>", "the remote capture interface"); extcap_help_add_option(extcap_conf, "--remote-filter <filter>", "a filter for remote capture " "(default: don't capture data for lal interfaces IPs)"); diff --git a/extcap/sshdump.c b/extcap/sshdump.c index 9d16161246..92d648fc5e 100644 --- a/extcap/sshdump.c +++ b/extcap/sshdump.c @@ -414,7 +414,7 @@ int main(int argc, char *argv[]) extcap_help_add_option(extcap_conf, "--remote-password <password>", "the remote SSH password. If not specified, ssh-agent and ssh-key are used"); extcap_help_add_option(extcap_conf, "--sshkey <public key path>", "the path of the ssh key"); extcap_help_add_option(extcap_conf, "--sshkey-passphrase <public key passphrase>", "the passphrase to unlock public ssh"); - extcap_help_add_option(extcap_conf, "--proxycommand <proxy command>", "the command to use as proxy the the ssh connection"); + extcap_help_add_option(extcap_conf, "--proxycommand <proxy command>", "the command to use as proxy for the ssh connection"); extcap_help_add_option(extcap_conf, "--remote-interface <iface>", "the remote capture interface"); extcap_help_add_option(extcap_conf, "--remote-capture-command <capture command>", "the remote capture command"); extcap_help_add_option(extcap_conf, "--remote-sudo", "use sudo on the remote machine to capture"); diff --git a/image/README.adoc b/image/README.adoc index 5de97eb820..7a2cbcab85 100644 --- a/image/README.adoc +++ b/image/README.adoc @@ -43,7 +43,7 @@ https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html[ For example, the INS specifies “list-add” and “list-remove”. and we've added “list-copy”, “list-move-up“, “list-move-down”, and “list-clear”. The Wireshark application icon, document icon, and several toolbar icons were created by Elliott Aldrich. -The list-add and list-remove images were created by by Peter Hosey and released under CC-PD. +The list-add and list-remove images were created by Peter Hosey and released under CC-PD. The list-clear images were created by Freepik, http://www.freepik.com from https://www.flaticon.com. The following projects provide icons which are a) nicely drawn and b) released under a compatible license and c) actively developed (as of October 2020) which might want to use in the future: diff --git a/org.wireshark.Wireshark-mime.xml b/org.wireshark.Wireshark-mime.xml index 69e3e4bf2d..a9f904c8f9 100644 --- a/org.wireshark.Wireshark-mime.xml +++ b/org.wireshark.Wireshark-mime.xml @@ -6,7 +6,7 @@ to show for the file in a file browser). Both magic and file name glob patterns are supported; glob patterns are - preferred since they don't require require opening and reading part of + preferred since they don't require opening and reading part of the file to determine its type. The specification for this file can be found here: diff --git a/plugins/epan/gryphon/packet-gryphon.c b/plugins/epan/gryphon/packet-gryphon.c index 7da38456c1..8d8423dc68 100644 --- a/plugins/epan/gryphon/packet-gryphon.c +++ b/plugins/epan/gryphon/packet-gryphon.c @@ -621,7 +621,7 @@ static const value_string cmd_vals[] = { { CMD_SCHED_TX, "Schedule transmission of messages" }, { CMD_SCHED_KILL_TX, "Stop and destroy a message schedule transmission" }, { CMD_SCHED_MSG_REPLACE, "Replace a scheduled message" }, - { CMD_PGM_DESC, "Describe program to to uploaded" }, + { CMD_PGM_DESC, "Describe program to be uploaded" }, { CMD_PGM_UPLOAD, "Upload a program to the Gryphon" }, { CMD_PGM_DELETE, "Delete an uploaded program" }, { CMD_PGM_LIST, "Get a list of uploaded programs" }, diff --git a/plugins/epan/gryphon/packet-gryphon.h b/plugins/epan/gryphon/packet-gryphon.h index 4f69b3c7e5..477f897c33 100644 --- a/plugins/epan/gryphon/packet-gryphon.h +++ b/plugins/epan/gryphon/packet-gryphon.h @@ -155,7 +155,7 @@ /* Program loader (SD_PGM) commands: */ -#define CMD_PGM_DESC (SD_PGM * 256 + 0x90) /* Describe a program to to uploaded */ +#define CMD_PGM_DESC (SD_PGM * 256 + 0x90) /* Describe a program to be uploaded */ #define CMD_PGM_UPLOAD (SD_PGM * 256 + 0x91) /* Upload a program to the Gryphon */ #define CMD_PGM_DELETE (SD_PGM * 256 + 0x92) /* Delete an uploaded program */ #define CMD_PGM_LIST (SD_PGM * 256 + 0x93) /* Get a list of uploaded programs */ diff --git a/speexdsp/resample.c b/speexdsp/resample.c index 4457c639b8..32197fe5f6 100644 --- a/speexdsp/resample.c +++ b/speexdsp/resample.c @@ -353,7 +353,7 @@ static int resampler_basic_direct_single(SpeexResamplerState *st, spx_uint32_t c for(j=0;j<N;j++) sum += MULT16_16(sinct[j], iptr[j]); /* This code is slower on most DSPs which have only 2 accumulators. - Plus this this forces truncation to 32 bits and you lose the HW guard bits. + Plus this forces truncation to 32 bits and you lose the HW guard bits. I think we can trust the compiler and let it vectorize and/or unroll itself. spx_word32_t accum[4] = {0,0,0,0}; for(j=0;j<N;j+=4) { diff --git a/test/lua/proto.lua b/test/lua/proto.lua index e24a439acb..6ea842a4bb 100644 --- a/test/lua/proto.lua +++ b/test/lua/proto.lua @@ -652,7 +652,7 @@ getQueryName = function (tvbr) end pos = pos + 1 -- move past label length octet -- sadly, there's no current way to get a raw Lua string from a ByteArray (nor from Tvb for that matter) - -- so we need to do it one character at a a time + -- so we need to do it one character at a time -- append the label and a dot to name string name = name .. byteArray2String(barray, pos, label_len) .. "." len_remaining = len_remaining - (label_len + 1) -- subtract label and its length octet diff --git a/tools/check_typed_item_calls.py b/tools/check_typed_item_calls.py index 08ac941140..52e6943625 100755 --- a/tools/check_typed_item_calls.py +++ b/tools/check_typed_item_calls.py @@ -273,7 +273,7 @@ class Item: def check_bit(self, value, n): return (value & (0x1 << n)) != 0 - # Output a warning if non-contigous bits are found in the the mask (guint64). + # Output a warning if non-contigous bits are found in the mask (guint64). # Note that this legimately happens in several dissectors where multiple reserved/unassigned # bits are conflated into one field. # TODO: there is probably a cool/efficient way to check this? diff --git a/tools/html2text.py b/tools/html2text.py index a8e6bffde5..b98b3dea38 100755 --- a/tools/html2text.py +++ b/tools/html2text.py @@ -224,7 +224,7 @@ def main(): if hasattr(f, 'buffer'): # Access raw (byte) buffer in Python 3 instead of decoded one f = f.buffer - # Read stdin as as Unicode string + # Read stdin as a Unicode string htmlparser.feed(f.read().decode('utf-8')) finally: if filename is not None: diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index 1363b6a5a9..2380ca9fcb 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -28,7 +28,7 @@ void register_tap_listener_camelsrt(void); -/* Save the the first NUM_RAS_STATS stats in the array to calculate percentile */ +/* Save the first NUM_RAS_STATS stats in the array to calculate percentile */ #define NUM_RAS_STATS 500000 /* Number of couple message Request/Response to analyze*/ diff --git a/ui/failure_message.c b/ui/failure_message.c index 5c1d874c5a..ebfddbd06c 100644 --- a/ui/failure_message.c +++ b/ui/failure_message.c @@ -90,7 +90,7 @@ output_file_description(const char *fname) char *fstring; if (strcmp(fname, "-") == 0) { - /* We're writing to to the standard output */ + /* We're writing to the standard output */ fstring = g_strdup("standard output"); } else { /* We're writing to a file */ diff --git a/ui/voip_calls.c b/ui/voip_calls.c index bba062c0cf..7e36fdcd5f 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -962,7 +962,7 @@ t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const } /* if setup_frame_number in the t38 packet is 0, it means it was not set using an SDP or H245 sesion, which means we don't - * have the associated Voip calls. It probably means the the packet was decoded using the default t38 port, or using "Decode as.." + * have the associated Voip calls. It probably means that the packet was decoded using the default t38 port, or using "Decode as.." * in this case we create a "voip" call that only have t38 media (no signaling) * OR if we have not found the Setup message in the graph. */ diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h index bbd87895dc..9750d2879d 100644 --- a/ui/win32/file_dlg_win32.h +++ b/ui/win32/file_dlg_win32.h @@ -26,7 +26,7 @@ extern "C" { * * 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, which we can do here. * 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/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 <gerald@wireshark.org> 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 diff --git a/wsutil/to_str.c b/wsutil/to_str.c index f30ad0bcb7..4c1cb5cfe1 100644 --- a/wsutil/to_str.c +++ b/wsutil/to_str.c @@ -210,7 +210,7 @@ bytes_to_hexstr_punct(char *out, const guint8 *ad, size_t len, char punct) } /* Routine to convert a sequence of bytes to a hex string, one byte/two hex - * digits at at a time, with a specified punctuation character between + * digits at a time, with a specified punctuation character between * the bytes. * * If punct is '\0', no punctuation is applied (and thus diff --git a/wsutil/win32-utils.h b/wsutil/win32-utils.h index f2c24c2870..2ec9d8bc05 100644 --- a/wsutil/win32-utils.h +++ b/wsutil/win32-utils.h @@ -60,7 +60,7 @@ const char * win32strexception(DWORD exception); /** * @brief ws_pipe_create_process Create a process and assign it to the main application - * job object so that it will be killed the the main application exits. + * job object so that it will be killed when the main application exits. * @param application_name Application name. Will be converted to its UTF-16 equivalent or NULL. * @param command_line Command line. Will be converted to its UTF-16 equivalent. * @param process_attributes Same as CreateProcess. |