diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 299a9914d2..3e07af394f 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -8420,7 +8420,7 @@ proto_register_cip(void) { &hf_cip_sc_mult_serv_pack_num_services, { "Number of Services", "cip.msp.num_services", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_sc_mult_serv_pack_offset, { "Offset", "cip.msp.offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_find_next_object_max_instance, { "Maximum ID", "cip.find_next_object.max_instance", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_cip_find_next_object_num_instances, { "Number of Instances:", "cip.find_next_object.num_instances", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_cip_find_next_object_num_instances, { "Number of Instances", "cip.find_next_object.num_instances", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_find_next_object_instance_item, { "Instance", "cip.find_next_object.instance", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_sc_group_sync_is_sync, { "IsSynchronized", "cip.group_sync.is_sync", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_data, { "Data", "cip.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index 0d6ab3f453..ee3814d22e 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -3929,17 +3929,17 @@ proto_register_fileexp (void) NULL, HFILL} }, { &hf_fileexp_setcontext_rqst_epochtime, - { "EpochTime:", "fileexp.setcontext_rqst_epochtime", + { "EpochTime", "fileexp.setcontext_rqst_epochtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL} }, { &hf_fileexp_setcontext_rqst_clientsizesattrs, - { "ClientSizeAttrs:", "fileexp.setcontext_clientsizesattrs", + { "ClientSizeAttrs", "fileexp.setcontext_clientsizesattrs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} }, { &hf_fileexp_setcontext_rqst_parm7, - { "Parm7:", "fileexp.setcontext.parm7", + { "Parm7", "fileexp.setcontext.parm7", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} }, diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 110abaf1ed..f6e8c82f3c 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -1969,7 +1969,7 @@ proto_register_fcswils(void) #if 0 { &hf_swils_fspfh_cmd, - {"Command:", "swils.fspf.cmd", + {"Command", "swils.fspf.cmd", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, #endif diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 7d3fafb23e..de4f31e09e 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -9364,7 +9364,7 @@ void proto_register_gtpv2(void) FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL} }, {&hf_gtpv2_clii, - {"CLII (Change of Location Information Indication):", "gtpv2.clii", + {"CLII (Change of Location Information Indication)", "gtpv2.clii", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL} }, {&hf_gtpv2_cpsr, diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 0ae595851e..e4dd80f35e 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -12775,7 +12775,7 @@ void proto_register_rtps(void) { }, { &hf_rtps_coherent_set_end, { - "End of coherent set sequence:", + "End of coherent set sequence", "rtps.coherent_set.end", FT_UINT64, BASE_DEC, diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 10e13d25f8..cd29aeb4e4 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5755,7 +5755,7 @@ proto_register_tn3270(void) NULL, HFILL } }, { &hf_tn3270_load_format_storage_operand, - { "Operand:", + { "Operand", "tn3270.load_format_storage_operand", FT_UINT8, BASE_HEX, VALS(vals_load_storage_format_operand), 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index a496643f63..8a8600a1f4 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -7418,7 +7418,7 @@ proto_register_tn5250(void) { &hf_tn5250_field_data, { "Field Data", "tn5250.field_data", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_tn5250_reserved, { "Flags (Reserved):", "tn5250.reserved", + { &hf_tn5250_reserved, { "Flags (Reserved)", "tn5250.reserved", FT_UINT8, BASE_HEX|BASE_RANGE_STRING, RVALS(vals_tn5250_reserved), 0, NULL, HFILL }}, { &hf_tn5250_unknown_data, diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c index 1569de355f..3b4565462e 100644 --- a/epan/dissectors/packet-wreth.c +++ b/epan/dissectors/packet-wreth.c @@ -1498,7 +1498,7 @@ void proto_register_wreth(void) NULL, HFILL } }, { &hf_Wreth_IdentificationMacAddr, - { "Client MAC address :", "wreth.IdentClientMacAddr", + { "Client MAC address", "wreth.IdentClientMacAddr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/tools/check_typed_item_calls.py b/tools/check_typed_item_calls.py index dd538074df..778bc4d86c 100755 --- a/tools/check_typed_item_calls.py +++ b/tools/check_typed_item_calls.py @@ -242,6 +242,8 @@ class Item: label.count('[') != label.count(']') or label.count('{') != label.count('}')): print('Warning: ' + filename + ': - filter "' + filter + '" label', '"' + label + '"', 'has unbalanced parens/braces/brackets') + if item_type != 'FT_NONE' and label.endswith(':'): + print('Warning: ' + filename + ': - filter "' + filter + '" label', '"' + label + '"', 'ends with an unnecessary colon') self.item_type = item_type self.type_modifier = type_modifier