osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix more repeated words throughout 

Fixes more repeated words seen throughout
the code base.
This commit is contained in:
Moshe Kaplan 2021-12-30 22:03:45 -05:00 committed by Wireshark GitLab Utility
parent 6930a2db83
commit 67f05835ca
28 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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

2
epan/dissectors/packet-alljoyn.c
View File

@ -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

2
epan/dissectors/packet-capwap.c
View File

@ -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 }
},

2
epan/dissectors/packet-cipmotion.c
View File

@ -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
*/

2
epan/dissectors/packet-diameter.c
View File

@ -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;

2
epan/dissectors/packet-gre.c
View File

@ -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",

2
epan/dissectors/packet-http.c
View File

@ -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

4
epan/dissectors/packet-icmpv6.c
View File

@ -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 }},

2
epan/dissectors/packet-msdp.c
View File

@ -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);

2
epan/dissectors/packet-nfs.c
View File

@ -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);

2
epan/dissectors/packet-oran.c
View File

@ -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}
},

2
epan/dissectors/packet-pcp.c
View File

@ -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;

2
epan/dissectors/packet-quic.c
View File

@ -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",

2
epan/dissectors/packet-ranap.c
View File

@ -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);

2
epan/dissectors/packet-scsi.h
View File

@ -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;

2
epan/dissectors/packet-skinny.c
View File

@ -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,

2
epan/dissectors/packet-sna.c
View File

@ -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

2
epan/dissectors/packet-tcp.c
View File

@ -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

2
epan/dissectors/packet-tplink-smarthome.c
View File

@ -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;

2
epan/oids.h
View File

@ -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

2
plugins/epan/transum/extractors.c
View File

@ -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

2
tools/WiresharkXML.py
View File

@ -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.

2
tools/fix-encoding-args.pl
View File

@ -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;

2
tools/test-common.sh
View File

@ -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

6
tools/yacc.py
View File

@ -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.

2
tshark.c
View File

@ -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,

2
ui/qt/widgets/wireshark_file_dialog.h
View File

@ -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.

2
ui/simple_dialog.h
View File

@ -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, ...)