From 4633621c3e8526669fc6dcc10e045a5f85cee7ca Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Sat, 12 Feb 2022 23:13:56 +0000 Subject: [PATCH] Some spelling fixes --- .../asn1/camel/packet-camel-template.c | 2 +- epan/dissectors/packet-camel.c | 2 +- epan/dissectors/packet-netflow.c | 2 +- epan/dissectors/packet-sbus.c | 4 +- epan/dissectors/packet-stanag4607.c | 2 +- tools/check_spelling.py | 16 ++++++- tools/wireshark_words.txt | 45 ++++++++++++++++--- 7 files changed, 61 insertions(+), 12 deletions(-) diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c index 6f34c361d5..b674b02583 100644 --- a/epan/dissectors/asn1/camel/packet-camel-template.c +++ b/epan/dissectors/asn1/camel/packet-camel-template.c @@ -183,7 +183,7 @@ static const value_string camel_Component_vals[] = { const value_string camelSRTtype_naming[]= { { CAMELSRT_SESSION, "TCAP_Session" }, - { CAMELSRT_VOICE_INITIALDP, "InialDP/Continue" }, + { CAMELSRT_VOICE_INITIALDP, "InitialDP/Continue" }, { CAMELSRT_VOICE_ACR1, "Slice1_ACR/ACH" }, { CAMELSRT_VOICE_ACR2, "Slice2_ACR/ACH" }, { CAMELSRT_VOICE_ACR3, "Slice3_ACR/ACH" }, diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index d6f23daa99..b1f70975ca 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -883,7 +883,7 @@ static const value_string camel_Component_vals[] = { const value_string camelSRTtype_naming[]= { { CAMELSRT_SESSION, "TCAP_Session" }, - { CAMELSRT_VOICE_INITIALDP, "InialDP/Continue" }, + { CAMELSRT_VOICE_INITIALDP, "InitialDP/Continue" }, { CAMELSRT_VOICE_ACR1, "Slice1_ACR/ACH" }, { CAMELSRT_VOICE_ACR2, "Slice2_ACR/ACH" }, { CAMELSRT_VOICE_ACR3, "Slice3_ACR/ACH" }, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index a06e5a5b54..2c34efe3cc 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -16960,7 +16960,7 @@ proto_register_netflow(void) }, /* ntop, 35632 / 320 */ {&hf_pie_ntop_mysql_appl_latency_usec, - {"MySQL request->response latecy (usec)", "cflow.pie.ntop.mysql_appl_latency_usec", + {"MySQL request->response latency (usec)", "cflow.pie.ntop.mysql_appl_latency_usec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} }, diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index a16cc97b6c..449a4af3c8 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -2267,7 +2267,7 @@ proto_register_sbus(void) { &hf_sbus_block_nr, { "Block/Element nr", "sbus.block_nr", FT_UINT16, BASE_DEC, NULL, 0, - "Program block / DatatBlock number", HFILL } + "Program block / DataBlock number", HFILL } }, { &hf_sbus_nbr_elements, @@ -2285,7 +2285,7 @@ proto_register_sbus(void) { &hf_sbus_data_rtc, { "S-Bus 32-bit data", "sbus.data_rtc", FT_UINT32, BASE_DEC, NULL, 0, - "One regiser/timer of counter (32 bit value)", HFILL } + "One register/timer of counter (32 bit value)", HFILL } }, { &hf_sbus_data_byte, diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 83916086f6..ff41624278 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -281,7 +281,7 @@ static const value_string stanag4607_target_vals[] = { { 131, "Rotary Wing Aircraft, Simulated Target" }, { 132, "Fixed Wing Aircraft, Simulated Target" }, { 133, "Stationary Rotator, Simulated Target" }, - { 134, "Maritme, Simulated Target" }, + { 134, "Maritime, Simulated Target" }, { 135, "Beacon, Simulated Target" }, { 136, "Amphibious, Simulated Target" }, { 137, "Person, Simulated Target" }, diff --git a/tools/check_spelling.py b/tools/check_spelling.py index 51c495e139..0ff7ec0c01 100755 --- a/tools/check_spelling.py +++ b/tools/check_spelling.py @@ -142,6 +142,16 @@ class File: return False + def numberPlusUnits(self, word): + m = re.search(r'^([0-9]+)([a-zA-Z]+)$', word) + if m: + if m.group(2).lower() in { "bit", "bits", "gb", "kbps", "gig", "mb", "th", "mhz", "v", "hz", "k", + "mbps", "m", "g", "ms", "nd", "nds", "rd", "kb", "kbit", + "khz", "km", "ms", "usec", "sec", "gbe", "ns", "ksps", "qam" }: + return True + return False + + # Check the spelling of all the words we have found def spellCheck(self): @@ -212,6 +222,9 @@ class File: word = word.replace('“', '') word = word.replace('”', '') + if self.numberPlusUnits(word): + continue + if len(word) > 4 and spell.unknown([word]) and not self.checkMultiWords(word) and not self.wordBeforeId(word): print(self.file, this_value, '/', num_values, '"' + original + '"', bcolors.FAIL + word + bcolors.ENDC, ' -> ', '?') @@ -232,7 +245,8 @@ 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", "frame’s", "vendor’s", "system’s"] + "querier’s", "sender’s", "receiver’s", "computer’s", "frame’s", "vendor’s", "system’s", + "we’ll", "asciidoctor’s", "protocol’s", "microsoft’s" ] for c in contractions: code_string = code_string.replace(c, "") code_string = code_string.replace(c.capitalize(), "") diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 097f67ebad..f3ae89ab7a 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -1,19 +1,15 @@ 0x%02x 0x%08x -100gb -100kbps -100mb 10base 10gig 16apsk -16bit 1xrtt -32bit 3gpp2 3pcap 5views 80211n 80mhz +abbrev accelerometer acceptor accessor @@ -27,6 +23,7 @@ activations actuator acyclic addba +additionals additionsr adjacency adlink @@ -122,6 +119,7 @@ bibliographic bibliography bidirectional bidirectionally +bigint bitfield bitmask bitrate @@ -182,6 +180,7 @@ carrierid casio categorizes cccid +ccitt ccpch cctrch cdma2000 @@ -204,6 +203,7 @@ checkbox checkout checksum chksum +chmod choco chocolatey choplen @@ -218,6 +218,7 @@ ciphertext ciplus citrix cksum +classifiers classmark classmark3 clientkey @@ -260,6 +261,7 @@ connectionless connid const contactless +contiguity contiguously coord Coord3D @@ -284,6 +286,7 @@ crnti crypto cryptographic csapi +ctime ctype customizable customization @@ -438,12 +441,14 @@ endace endian endianness endif +endpoint engineid enodeb enqueue enrollee entityid entryid +enttec enumerates enumerations enumerator @@ -483,6 +488,7 @@ fastcom fastip fastmsg fattr +featureful fiber fileset firewall @@ -595,6 +601,7 @@ illuminance immersive implementations implementer +implementers implementor inactivated inband @@ -632,9 +639,11 @@ interferer interleaving interruptible interworking +inuse invalidation ioctl ioerr +ioflag iograph iotecha ipaccess @@ -662,6 +671,7 @@ iterator itunes iwarp ixveriwave +jacobson jetds jsonraw kademlia @@ -750,6 +760,7 @@ meshcop messageid metadata meteorological +metermod México mgmtmsg microbit @@ -764,12 +775,14 @@ mirrorlink misconfiguration misconfigured mitsubishi +mkdir mode01 mode7 modepage modespecificinfo modulo motorola +mozilla mpeg4 mplstp mpsse @@ -783,6 +796,7 @@ msisdn mtftp mtrace mudurl +mulaw multiband multicarrier multicast @@ -847,6 +861,8 @@ nonblock noncriticalextension noncriticalextensions nopad +noqueue +nordig nortel notarized notational @@ -868,6 +884,7 @@ nstrace ntlmssp nullptr nvmeof +nvram obfuscated objectid objkey @@ -900,6 +917,7 @@ optimizations optimizer optiplex ordinal +oscillatory osmocom ospf6 outhdr @@ -986,6 +1004,7 @@ privkey procid profidrive profinet +promiscsniff promiscuously propertykey protected @@ -1006,6 +1025,7 @@ pubkey pucch pusch pwach +pxeclient pytest qam16 qam64 @@ -1015,6 +1035,7 @@ qsearch quadrature quadro quantifiers +queryhit quiescing quintuplet quintuplets @@ -1159,6 +1180,8 @@ rsocket rsrvd rtpmidi rtpmux +ruleset +rxchannel rxreq s7comm sacch @@ -1189,12 +1212,14 @@ sercos serialize serialized sessionid +sessionkey setattr setcap setuid severities sflow sftpserver +sftserver sgdsn sgsap sha256 @@ -1383,6 +1408,7 @@ tuples tvbuff twamp twopc +txchannel type1 type2 type3 @@ -1391,6 +1417,7 @@ uarfcn uavcan uboot ubuntu +ucast udpcp udpdump udphdr @@ -1537,6 +1564,7 @@ v1610 validator varint vcredist +vcxproj verbosity verifier verizon @@ -1548,6 +1576,7 @@ version6 version7 versioned versioning +vhdset viavi virtex virtualization @@ -1567,6 +1596,7 @@ wikipedia wikis wimax wimaxasncp +winget winpcap winspool wireshark @@ -1584,13 +1614,18 @@ wscbor wslua wsluarm wsutil +X32bit +x509if x509sat xattr xchannel +xetra xferext xmlns xsltproc xtreme z3950 +zbncp zeroes zigbee +zugtyp