From cd77e5aa5ff7b1bb95dc1e935db50a168eceb6e0 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Sat, 20 Feb 2021 23:50:15 +0000 Subject: [PATCH] Some more spelling fixes. Also add more words to dictionary file. --- docbook/wsdg_src/WSDG_chapter_env_intro.adoc | 2 +- docbook/wsug_src/WSUG_chapter_customize.adoc | 2 +- epan/dissectors/packet-bgp.c | 2 +- epan/dissectors/packet-bssgp.c | 44 +++++++++--------- epan/dissectors/packet-v52.c | 10 ++--- tools/check_spelling.py | 6 ++- tools/wireshark_words.txt | 47 ++++++++++++++++++++ ui/qt/widgets/qcustomplot.cpp | 2 +- wiretap/nettrace_3gpp_32_423.c | 2 +- 9 files changed, 83 insertions(+), 34 deletions(-) diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.adoc b/docbook/wsdg_src/WSDG_chapter_env_intro.adoc index 8871241d0f..87f137a5a5 100644 --- a/docbook/wsdg_src/WSDG_chapter_env_intro.adoc +++ b/docbook/wsdg_src/WSDG_chapter_env_intro.adoc @@ -231,7 +231,7 @@ Later chapters describe the required tools and libraries in detail. === Automated Builds (GitLab CI And Buildbot) -The Wireshark devlopment team uses GitLab’s continuous integration (CI) system and Buildbot to automatically build Wireshark for each Git merge request and commit. Automated builds provide several useful services: +The Wireshark development team uses GitLab’s continuous integration (CI) system and Buildbot to automatically build Wireshark for each Git merge request and commit. Automated builds provide several useful services: * Cross-platform testing. Inbound merge requests and commits can be tested on each of our supported plaforms, which ensures that a developer on one platform doesn’t break the build on other platforms. diff --git a/docbook/wsug_src/WSUG_chapter_customize.adoc b/docbook/wsug_src/WSUG_chapter_customize.adoc index 05fe58ee3b..bba03b1b15 100644 --- a/docbook/wsug_src/WSUG_chapter_customize.adoc +++ b/docbook/wsug_src/WSUG_chapter_customize.adoc @@ -1078,7 +1078,7 @@ specific case and a general one the specific one must appear first in the list. Protocol:: This is the name of the encapsulating protocol (the lowest layer in the packet -data) it can be either just the name of the protocol (e.g. mtp2, eth_witoutfcs, +data) it can be either just the name of the protocol (e.g. mtp2, eth_withoutfcs, sscf-nni ) or the name of the encapsulation protocol and the “application” protocol over it separated by a colon (e.g sscop:sscf-nni, sscop:alcap, sscop:nbap, ...) diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 8b71c9bb6f..a29b4e6c58 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -11191,7 +11191,7 @@ proto_register_bgp(void) { "Ignore remarking", "bgp.ext_com_qos.flags.ignore_remarking", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x08, NULL, HFILL}}, { &hf_bgp_ext_com_qos_flags_agg_marking, - { "Aggegation of markins", "bgp.ext_com_qos.flags.agg_marking", FT_BOOLEAN, 8, + { "Aggregation of markins", "bgp.ext_com_qos.flags.agg_marking", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x04, NULL, HFILL}}, { &hf_bgp_ext_com_cos_flags, { "Flags byte", "bgp.ext_com_cos.flags", FT_UINT8, BASE_HEX, diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 9d741b450b..0ded034048 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -196,8 +196,8 @@ static int hf_bssgp_ggsn_pgw_location = -1; static int hf_bssgp_edrx_cycle_value = -1; static int hf_bssgp_tunpo_minutes = -1; static int hf_bssgp_tunpo_seconds = -1; -static int hf_bssgp_ec_dl_coveradge_class = -1; -static int hf_bssgp_ec_ul_coveradge_class = -1; +static int hf_bssgp_ec_dl_coverage_class = -1; +static int hf_bssgp_ec_ul_coverage_class = -1; static int hf_bssgp_pei = -1; static int hf_bssgp_paging_attempt_count = -1; static int hf_bssgp_intended_num_of_pag_attempts = -1; @@ -535,7 +535,7 @@ x91 IRAT Measurement Configuration (extended E-ARFCNs) */ #define BSSGP_IEI_EDRX_PARAMETERS 0x92 #define BSSGP_IEI_TUNPO 0x93 -#define BSSGP_IEI_COVERADGE_CLASS 0x98 +#define BSSGP_IEI_COVERAGE_CLASS 0x98 #define BSSGP_IEI_PAG_ATTEMPT_INFO 0x99 #define BSSGP_IEI_EXCEPTION_REPORT_FLAG 0x9a #define BSSGP_IEI_OLD_RA_IDENTIFICATION 0x9b @@ -3503,7 +3503,7 @@ de_bssgp_tunpo(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 /* * 11.3.124 Coverage Class */ -static const value_string bssgp_ec_dl_coveradge_class_vals[] = { +static const value_string bssgp_ec_dl_coverage_class_vals[] = { { 0x0, "reserved" }, { 0x1, "DL Coverage Class 1" }, { 0x2, "DL Coverage Class 2" }, @@ -3512,7 +3512,7 @@ static const value_string bssgp_ec_dl_coveradge_class_vals[] = { { 0, NULL } }; -static const value_string bssgp_ec_ul_coveradge_class_vals[] = { +static const value_string bssgp_ec_ul_coverage_class_vals[] = { { 0x0, "reserved" }, { 0x1, "UL Coverage Class 1" }, { 0x2, "UL Coverage Class 2" }, @@ -3522,14 +3522,14 @@ static const value_string bssgp_ec_ul_coveradge_class_vals[] = { }; static guint16 -de_bssgp_coveradge_class(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_coverage_class(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; curr_offset = offset; - proto_tree_add_item(tree, hf_bssgp_ec_dl_coveradge_class, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_bssgp_ec_ul_coveradge_class, tvb, curr_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_bssgp_ec_dl_coverage_class, tvb, curr_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_bssgp_ec_ul_coverage_class, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; return(curr_offset - offset); @@ -3714,7 +3714,7 @@ typedef enum DE_BSSGP_PRIORITY_CLASS_IND, /* 11.3.119 Priority Class Indicator */ DE_BSSGP_EDRX_PARAMS, /* 11.3.122 eDRX Parameters */ DE_BSSGP_TUNPO, /* 11.3.123 Time Until Next Paging Occasion */ - DE_BSSGP_COVERADGE_CLASS, /* 11.3.124 Coverage Class */ + DE_BSSGP_COVERAGE_CLASS, /* 11.3.124 Coverage Class */ DE_BSSGP_PAG_ATTEMPT_INFO, /* 11.3.125 Paging Attempt Information */ DE_BSSGP_EXCEPTION_REPORT_FLAG, /* 11.3.126 Exception Report Flag */ DE_BSSGP_OLD_RA_IDENTIFICATION, /* 11.3.127 Old Routing Area Identification */ @@ -3881,7 +3881,7 @@ static const value_string bssgp_elem_strings[] = { { DE_BSSGP_PRIORITY_CLASS_IND, "Priority Class Indicator" }, /* 11.3.119 Priority Class Indicator */ { DE_BSSGP_EDRX_PARAMS, "eDRX Parameters" }, /* 11.3.122 eDRX Parameters */ { DE_BSSGP_TUNPO, "Time Until Next Paging Occasion" }, /* 11.3.123 Time Until Next Paging Occasion */ - { DE_BSSGP_COVERADGE_CLASS, "Coverage Class" }, /* 11.3.124 Coverage Class */ + { DE_BSSGP_COVERAGE_CLASS, "Coverage Class" }, /* 11.3.124 Coverage Class */ { DE_BSSGP_PAG_ATTEMPT_INFO, "Paging Attempt Information" }, /* 11.3.125 Paging Attempt Information */ { DE_BSSGP_EXCEPTION_REPORT_FLAG, "Exception Report Flag" }, /* 11.3.126 Exception Report Flag */ { DE_BSSGP_OLD_RA_IDENTIFICATION, "Old Routing Area Identification" }, /* 11.3.127 Old Routing Area Identification */ @@ -4007,7 +4007,7 @@ guint16 (*bssgp_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, de_bssgp_pri_class_ind, /* 11.3.119 Priority Class Indicator */ de_bssgp_edrx_params, /* 11.3.122 eDRX Parameters */ de_bssgp_tunpo, /* 11.3.122 Time Until Next Paging Occasion */ - de_bssgp_coveradge_class, /* 11.3.124 Coverage Class */ + de_bssgp_coverage_class, /* 11.3.124 Coverage Class */ de_bssgp_pag_attempt_info, /* 11.3.125 Paging Attempt Information */ NULL, /* 11.3.126 Exception Report Flag */ NULL, /* 11.3.127 Old Routing Area Identification */ @@ -4296,7 +4296,7 @@ bssgp_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o /* eDRX Parameters (note 11) eDRX Parameters/11.3.122 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_EDRX_PARAMETERS, BSSGP_PDU_TYPE, DE_BSSGP_EDRX_PARAMS, NULL); /* Coverage Class Coverage Class/11.3.124 O TLV 3 */ - ELEM_OPT_TELV(BSSGP_IEI_COVERADGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERADGE_CLASS, NULL); + ELEM_OPT_TELV(BSSGP_IEI_COVERAGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERAGE_CLASS, NULL); /* Old Routing Area Identification (note 12) Old Routing Area Identification/11.3.127 O TLV 8 */ ELEM_OPT_TELV(BSSGP_IEI_OLD_RA_IDENTIFICATION, GSM_A_PDU_TYPE_GM, DE_RAI, " - Old routing area identification"); /* Attach Indicator(note 13) Attach Indicator / 11.3.128 O TLV 3 */ @@ -4352,7 +4352,7 @@ bssgp_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o /* Selected PLMN ID (note 5) Selected PLMN ID/11.3.118 O TLV 5 */ ELEM_OPT_TELV(BSSGP_IEI_SELECTED_PLMN_ID, BSSGP_PDU_TYPE, DE_BSSGP_PLMN_ID, " - Selected PLMN ID"); /* Coverage Class Coverage Class/11.3.124 O TLV 3 */ - ELEM_OPT_TELV(BSSGP_IEI_COVERADGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERADGE_CLASS, NULL); + ELEM_OPT_TELV(BSSGP_IEI_COVERAGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERAGE_CLASS, NULL); /* Exception Report Flag(note 6) Exception Report Flag / 11.3.126 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_EXCEPTION_REPORT_FLAG, BSSGP_PDU_TYPE, DE_BSSGP_EXCEPTION_REPORT_FLAG, NULL); /* Selected Operator(note 8, 9) PLMN Identity / 11.3.129 O TLV 5 */ @@ -4502,7 +4502,7 @@ bssgp_paging_ps(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off /* eDRX Parameters (note 11) eDRX Parameters/11.3.122 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_EDRX_PARAMETERS, BSSGP_PDU_TYPE, DE_BSSGP_EDRX_PARAMS, NULL); /* Coverage Class Coverage Class/11.3.124 O TLV 3 */ - ELEM_OPT_TELV(BSSGP_IEI_COVERADGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERADGE_CLASS, NULL); + ELEM_OPT_TELV(BSSGP_IEI_COVERAGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERAGE_CLASS, NULL); /* Cell Identifier (note 4) Cell Identifier/11.3.9 O TLV 10 */ ELEM_OPT_TELV(BSSGP_IEI_CELL_IDENTIFIER, BSSGP_PDU_TYPE, DE_BSSGP_CELL_ID, NULL); /* MS Radio Access Capability (note 5) MS Radio Access Capability/11.3.22 O TLV 7-? */ @@ -6011,7 +6011,7 @@ bssgp_perform_loc_request(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, g /* eDRX Parameters (note 7) eDRX Parameters/11.3.122 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_EDRX_PARAMETERS, BSSGP_PDU_TYPE, DE_BSSGP_EDRX_PARAMS, NULL); /* Coverage Class Coverage Class/11.3.124 O TLV 3 */ - ELEM_OPT_TELV(BSSGP_IEI_COVERADGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERADGE_CLASS, NULL); + ELEM_OPT_TELV(BSSGP_IEI_COVERAGE_CLASS, BSSGP_PDU_TYPE, DE_BSSGP_COVERAGE_CLASS, NULL); /* MS Radio Access Capability (note 8) MS Radio Access Capability/11.3.22 O TLV 7 ? */ ELEM_IN_ELEM_MAND_TELV(BSSGP_IEI_MS_RADIO_ACCESS_CAPABILITY, GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP, NULL); /* MultilaterationTiming Advance (note 9) MultilaterationTiming Advance/11.3.137 O TLV 4 */ @@ -7491,14 +7491,14 @@ proto_register_bssgp(void) FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL } }, - { &hf_bssgp_ec_dl_coveradge_class, - { "DL Coverage Class", "bssgp.ec_dl_coveradge_class", - FT_UINT8, BASE_DEC, VALS(bssgp_ec_dl_coveradge_class_vals), 0x38, + { &hf_bssgp_ec_dl_coverage_class, + { "DL Coverage Class", "bssgp.ec_dl_coverage_class", + FT_UINT8, BASE_DEC, VALS(bssgp_ec_dl_coverage_class_vals), 0x38, NULL, HFILL } }, - { &hf_bssgp_ec_ul_coveradge_class, - { "UL Coverage Class", "bssgp.ec_ul_coveradge_class", - FT_UINT8, BASE_DEC, VALS(bssgp_ec_ul_coveradge_class_vals), 0x07, + { &hf_bssgp_ec_ul_coverage_class, + { "UL Coverage Class", "bssgp.ec_ul_coverage_class", + FT_UINT8, BASE_DEC, VALS(bssgp_ec_ul_coverage_class_vals), 0x07, NULL, HFILL } }, { &hf_bssgp_sci, @@ -7556,7 +7556,7 @@ proto_register_bssgp(void) { &ei_bssgp_not_dissected_yet, { "bssgp.not_dissected_yet", PI_UNDECODED, PI_WARN, "Not dissected yet", EXPFILL }}, { &ei_bssgp_erroneous_app_container, { "bssgp.erroneous_app_container", PI_PROTOCOL, PI_WARN, "Erroneous Application Container including IEI and LI", EXPFILL }}, { &ei_bssgp_si_item, { "bssgp.erroneous_app_container", PI_PROTOCOL, PI_WARN, "Unknown SI message", EXPFILL }}, - { &ei_bssgp_unknown_rim_app_id_data, { "bssgp.rim_app_id_data.unknown", PI_PROTOCOL, PI_WARN, "Unknown RIM Application Identitys Data", EXPFILL }}, + { &ei_bssgp_unknown_rim_app_id_data, { "bssgp.rim_app_id_data.unknown", PI_PROTOCOL, PI_WARN, "Unknown RIM Application Identity Data", EXPFILL }}, { &ei_bssgp_unknown_app_container, { "bssgp.unknown_app_container", PI_PROTOCOL, PI_WARN, "Unknown Application Error Container", EXPFILL }}, { &ei_bssgp_ra_discriminator, { "bssgp.ra_discriminator.unknown", PI_PROTOCOL, PI_WARN, "Unknown RIM Routing Address discriminator", EXPFILL }}, { &ei_bssgp_unknown_rim_app_id, { "bssgp.rim_app_id.unknown", PI_PROTOCOL, PI_WARN, "Unknown RIM Application Identity", EXPFILL }}, diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 78798f9435..09d5727d7d 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -475,15 +475,15 @@ static const value_string reject_cause_type_values [] = { { 0x04, "Connection already present at the V5 time slot(s) to a different port or ISDN user port time slot(s)" }, { 0x05, "Connection already present at the ISDN user port time slot(s) to a different V5 time slot(s)" }, { 0x06, "User port unavailable (blocked)" }, - { 0x07, "De-allocation cannot completeddue to incompatible data content" }, - { 0x08, "De-allocation cannot completeddue to V5 time slot(s) data incompatibility" }, - { 0x09, "De-allocation cannot completeddue to port data incompatibility" }, - { 0x0a, "De-allocation cannot completeddue to user port time slot(s) data incompatibility" }, + { 0x07, "De-allocation cannot be completed due to incompatible data content" }, + { 0x08, "De-allocation cannot be completed due to V5 time slot(s) data incompatibility" }, + { 0x09, "De-allocation cannot be completed due to port data incompatibility" }, + { 0x0a, "De-allocation cannot be completed due to user port time slot(s) data incompatibility" }, { 0x0b, "User port not provisioned" }, { 0x0c, "Invalid V5 time slot(s) indication(s)" }, { 0x0d, "Invalid V5 2048 kbit/s link indication" }, { 0x0e, "Invalid user time slot(s) indication(s)" }, - { 0x0f, "V5 time slot(s) being used as physikal C-channel(s)" }, + { 0x0f, "V5 time slot(s) being used as physical C-channel(s)" }, { 0x10, "V5 link unavailable (blocked)" }, { 0, NULL } }; diff --git a/tools/check_spelling.py b/tools/check_spelling.py index 7a12068e89..825ee5d5c2 100755 --- a/tools/check_spelling.py +++ b/tools/check_spelling.py @@ -209,7 +209,7 @@ def removeContractions(code_string): "you’d", "developer’s", "doesn’t", "what’s", "let’s", "haven’t", "can’t", "you’ve", "shouldn’t", "didn’t", "wouldn’t", "aren’t", "there’s", "packet’s", "couldn’t", "world’s", "needn’t", "graph’s", "table’s", "parent’s", "entity’s", "server’s", "node’s", - "querier’s", "sender’s", "receiver’s", "computer’s"] + "querier’s", "sender’s", "receiver’s", "computer’s", "frame’s", "vendor’s", "system’s"] for c in contractions: code_string = code_string.replace(c, "") code_string = code_string.replace(c.capitalize(), "") @@ -220,13 +220,15 @@ def removeContractions(code_string): def removeComments(code_string): code_string = re.sub(re.compile(r"/\*.*?\*/",re.DOTALL ) ,"" ,code_string) # C-style comment # Remove this for now as can get tripped up if see htpps://www.... within a string! - #code_string = re.sub(re.compile(r"//.*?\n" ) ,"" ,code_string) # C++-style comment + code_string = re.sub(re.compile(r"^\s*//.*?\n" ) ,"" ,code_string) # C++-style comment return code_string def removeSingleQuotes(code_string): + code_string = code_string.replace('\\\\', " ") # Separate at \\ code_string = code_string.replace('\"\\\\\"', "") code_string = code_string.replace("\\\"", " ") code_string = code_string.replace("'\"'", "") + code_string = code_string.replace('…', ' ') return code_string def removeHexSpecifiers(code_string): diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 2714859040..461baee4d5 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -4,6 +4,7 @@ 1xrtt 32bit 3gpp2 +5views 80211n accelerometer accessor @@ -39,10 +40,12 @@ anonsvn aperiodic appdata appid +appkey arbitrated arduino arfcn asciidoc +asn1 asn1cnf asn2wrs assymetric @@ -68,6 +71,7 @@ autoneg autosar available avaya +avrcp backend backhaul backoff @@ -86,6 +90,7 @@ bitrate bitstring blackhole bnode +boolflag bootfile bootloader bootopt @@ -96,6 +101,7 @@ bssid bssids bssmap btatt +btbredr btcommon bthci btmesh @@ -107,6 +113,7 @@ builtin byte byteorder cablelabs +cadenced callback callid callsign @@ -135,6 +142,7 @@ cellid cellidentity centiseconds centrino +cfilters chan1 chan2 changelog @@ -155,6 +163,7 @@ ciphertext citrix classmark classmark3 +clientkey cmake cmdcontrol cmstatus @@ -163,6 +172,7 @@ codecs codepoint codeset codingrate +collectd colocated coloring colorise @@ -189,6 +199,7 @@ contactless contiguously copyfile couchbase +coverity cpdlc cpich cpuregisters @@ -247,6 +258,7 @@ demultiplexer demultiplexers deobfuscated deprecated +dequeue dequeued dereference dereferenced @@ -263,9 +275,11 @@ desegment desegmentation desegmenting deselect +destport devcap devmode dfilter +dfilters dfsauth dhcpv dialed @@ -339,6 +353,8 @@ extensibility exthdr extrainformation failover +fastmsg +fattr fiber fileset firewall @@ -359,6 +375,7 @@ framenumber frametype frontend fsctl +ftype functionalities funkt fvalue @@ -377,10 +394,13 @@ getnext getter gigabit gigamon +gigpod github gitlab gluster +gmail gmprs +gnutls goaway google gprscdr @@ -412,6 +432,7 @@ https huffman icmpv ident +idiographic idl2wrs iec60870 ieee17221 @@ -466,6 +487,7 @@ iterating iterator itunes iwarp +ixveriwave jetds kademlia keepalive @@ -482,6 +504,7 @@ l2cap lanalyzer lcgid lcids +lcsap leasequery libgcrypt libpcap @@ -584,6 +607,7 @@ netmask netmon netscaler nettl +netxray newpw nexthop nfs4err @@ -591,6 +615,7 @@ nghttp ngsniffer niagra noauth +nofcs nominals nonblock noncriticalextension @@ -600,6 +625,7 @@ notarized notif notifier notused +nowait npcap nprach nsapi @@ -697,11 +723,13 @@ protected protoabbrev protobuf protocolie +protos proxied proxying pscell pseudowire ptvcursor +ptype pubdir pubkey pucch @@ -714,6 +742,7 @@ quadro quiescing quintuplet quintuplets +radcom radeon radiotap ralink @@ -790,6 +819,7 @@ reregister reroute rerouted rerouting +rescan resegment resend resequencing @@ -834,6 +864,7 @@ scannable scell scoped scrollbar +sdusize sectorized segno semiautomatic @@ -841,6 +872,7 @@ sendto seqno seqnum sequenceno +sercos serialize serialized sessionid @@ -848,6 +880,7 @@ setattr setuid severities sflow +sgsap sha256 sha384 sha512 @@ -856,11 +889,13 @@ siapp sidelink signaling simulcast +skype slsch sname snaplen snow3g someip +someipsd spare spare1 spare2 @@ -880,11 +915,16 @@ spooled srbid srcport srvcc +sshkey ssupervisor +stanag stateful statusbar +stderr +stdout streamid struct +structs subaddress subband subcarrier @@ -933,6 +973,7 @@ sysframe syslog systemd tablemod +tclas tcpip tcpudp tdd128 @@ -950,6 +991,8 @@ timeslot timestamp timestamps timezone +tipcv +toggled toggling toolongfragment tooltip @@ -957,6 +1000,7 @@ touchlink touchpad traceroute transcoder +transifex transitioning traveler truncatable @@ -969,6 +1013,7 @@ tunneled tunneling tuple tvbuff +twamp type1 type2 type3 @@ -1043,6 +1088,7 @@ unparsable unparseable unparsed unprocessable +unpublish unpunctuated unreassembled unreceived @@ -1079,6 +1125,7 @@ userlist userplane utf8mb utilization +utils utran v1250 v1310 diff --git a/ui/qt/widgets/qcustomplot.cpp b/ui/qt/widgets/qcustomplot.cpp index 8956d8ab93..a26293dbf6 100644 --- a/ui/qt/widgets/qcustomplot.cpp +++ b/ui/qt/widgets/qcustomplot.cpp @@ -16556,7 +16556,7 @@ void QCPSelectionDecoratorBracket::drawBracket(QCPPainter *painter, int directio } default: { - qDebug() << Q_FUNC_INFO << "unknown/custom bracket style can't be handeld by default implementation:" << static_cast(mBracketStyle); + qDebug() << Q_FUNC_INFO << "unknown/custom bracket style can't be handled by default implementation:" << static_cast(mBracketStyle); break; } } diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 28312b19c7..2bba6b77da 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -619,7 +619,7 @@ nettrace_msg_to_packet(nettrace_3gpp_32_423_file_info_t *file_info, wtap_rec *re } else { /* Something wrong, bail out */ - *err_info = g_strdup_printf("Could not parse hex data,bufzize %u index %u %c%c", + *err_info = g_strdup_printf("Could not parse hex data, bufsize %u index %u %c%c", (pkt_data_len + exp_pdu_tags_len), i, chr1,