Fix all remaining filter name errors found with checkfiltername.pl

This should make it possible to add checkfiltername.pl to the pre-commit script.

Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0
Reviewed-on: https://code.wireshark.org/review/5166
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 40 insertions, 42 deletions

diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 033933d3fa..3fdafdef0d 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -3423,7 +3423,7 @@ proto_register_ansi_683(void)
       { &hf_ansi_683_max_sid_nid_3fc0, { "Maximum stored SID/NID pairs (MAX_SID_NID)", "ansi_683.max_sid_nid", FT_UINT16, BASE_DEC, NULL, 0x3fc0, NULL, HFILL }},
       { &hf_ansi_683_stored_sid_nid_3fc0, { "Number of stored SID/NID pairs (STORED_SID_NID)", "ansi_683.stored_sid_nid", FT_UINT16, BASE_DEC, NULL, 0x3fc0, NULL, HFILL }},
       { &hf_ansi_683_sid_nid_pairs_3fff, { "SID/NID pairs", "ansi_683.sid_nid_pairs", FT_UINT16, BASE_DEC, NULL, 0x3fff, NULL, HFILL }},
-      { &hf_ansi_683_n_digits, { "Number of digits (N_DIGITS)", "ansi_683n_digits", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
+      { &hf_ansi_683_n_digits, { "Number of digits (N_DIGITS)", "ansi_683.n_digits", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
       { &hf_ansi_683_slotted_mode, { "Slotted Mode", "ansi_683.slotted_mode", FT_UINT8, BASE_DEC, NULL, 0x20, NULL, HFILL }},
       { &hf_ansi_683_mob_p_rev_ff, { "Mobile station protocol revision number (MOB_P_REV)", "ansi_683.mob_p_rev", FT_UINT8, BASE_DEC, NULL, 0xFF, NULL, HFILL }},
       { &hf_ansi_683_imsi_m_class8000, { "IMSI_M Class assignment of the mobile station (IMSI_M_CLASS)", "ansi_683.imsi_m_class", FT_UINT16, BASE_DEC, NULL, 0x8000, NULL, HFILL }},
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c
index 7d474f3ff8..b475049196 100644
--- a/epan/dissectors/packet-fp_hint.c
+++ b/epan/dissectors/packet-fp_hint.c
@@ -579,7 +579,7 @@ proto_register_fp_hint(void)
 
     static ei_register_info ei[] = {
         { &ei_fph_radio_bearers, { "fp_hint.rb.invalid", PI_PROTOCOL, PI_WARN, "Frame contains more Radio Bearers than currently supported", EXPFILL }},
-        { &ei_fph_mac_frames, { "cip.mac_frames.invalid", PI_PROTOCOL, PI_WARN, "Frame contains more MAC Frames than currently supported", EXPFILL }},
+        { &ei_fph_mac_frames, { "fp_hint.mac_frames.invalid", PI_PROTOCOL, PI_WARN, "Frame contains more MAC Frames than currently supported", EXPFILL }},
         { &ei_fph_fp_channels, { "fp_hint.fp_channels.invalid", PI_PROTOCOL, PI_WARN, "Frame contains more FP channels than currently supported", EXPFILL }},
     };
 
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index 65227513e7..01b56849b6 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -110,7 +110,7 @@ proto_register_nonstd(void)
                 VALS(ms_codec_vals), 0, NULL, HFILL }
         },
         { &hf_h221_nonstd_netmeeting_non_standard,
-            { "Microsoft NetMeeting Non Standard", "netmeeting.non_standard", FT_BYTES, BASE_NONE,
+            { "Microsoft NetMeeting Non Standard", "h221nonstd.netmeeting.non_standard", FT_BYTES, BASE_NONE,
                 NULL, 0, NULL, HFILL }
         },
     };
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index e58f4b59b8..c33a6a1d2f 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -4075,53 +4075,53 @@ proto_register_mip6(void)
     },
 
     { &hf_fmip6_fbu_seqnr,
-      { "Sequence number", "fmip6.fbu.seqnr",
+      { "Sequence number", "mip6.fbu.seqnr",
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
     { &hf_fmip6_fbu_a_flag,
-      { "Acknowledge (A) flag", "fmip6.fbu.a_flag",
+      { "Acknowledge (A) flag", "mip6.fbu.a_flag",
         FT_BOOLEAN, 8, TFS(&fmip6_fbu_a_flag_value), 0x80,
         NULL, HFILL }
     },
     { &hf_fmip6_fbu_h_flag,
-      { "Home Registration (H) flag", "fmip6.fbu.h_flag",
+      { "Home Registration (H) flag", "mip6.fbu.h_flag",
         FT_BOOLEAN, 8, TFS(&fmip6_fbu_h_flag_value), 0x40,
         NULL, HFILL }
     },
     { &hf_fmip6_fbu_l_flag,
-      { "Link-Local Compatibility (L) flag", "fmip6.fbu.l_flag",
+      { "Link-Local Compatibility (L) flag", "mip6.fbu.l_flag",
         FT_BOOLEAN, 8, TFS(&fmip6_fbu_l_flag_value), 0x20,
         "Home Registration (H) flag", HFILL }
     },
     { &hf_fmip6_fbu_k_flag,
-      { "Key Management Compatibility (K) flag", "fmip6.fbu.k_flag",
+      { "Key Management Compatibility (K) flag", "mip6.fbu.k_flag",
         FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value), 0x10,
         NULL, HFILL }
     },
     { &hf_fmip6_fbu_lifetime,
-      { "Lifetime", "fmip6.fbu.lifetime",
+      { "Lifetime", "mip6.fbu.lifetime",
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
 
     { &hf_fmip6_fback_status,
-      { "Status", "fmip6.fback.status",
+      { "Status", "mip6.fback.status",
         FT_UINT8, BASE_DEC, VALS(fmip6_fback_status_value), 0,
         "Fast Binding Acknowledgement status", HFILL }
     },
     { &hf_fmip6_fback_k_flag,
-      { "Key Management Compatibility (K) flag", "fmip6.fback.k_flag",
+      { "Key Management Compatibility (K) flag", "mip6.fback.k_flag",
         FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value), 0x80,
         NULL, HFILL }
     },
     { &hf_fmip6_fback_seqnr,
-      { "Sequence number", "fmip6.fback.seqnr",
+      { "Sequence number", "mip6.fback.seqnr",
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
     { &hf_fmip6_fback_lifetime,
-      { "Lifetime", "fmip6.fback.lifetime",
+      { "Lifetime", "mip6.fback.lifetime",
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
@@ -4571,22 +4571,22 @@ proto_register_mip6(void)
     },
 
     { &hf_mip6_cr_req_type,
-      { "Req-type", "mmip6.cr.req_type",
+      { "Req-type", "mip6.cr.req_type",
         FT_UINT8, BASE_DEC | BASE_EXT_STRING, &mip6_mobility_options_ext, 0,
         NULL, HFILL }
     },
     { &hf_mip6_cr_req_length,
-      { "Req-type", "mmip6.cr.req_length",
+      { "Req-type", "mip6.cr.req_length",
         FT_UINT8, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
     { &hf_mip6_lmaa_opt_code,
-      { "Option-Code", "mmip6.lmaa.opt_code",
+      { "Option-Code", "mip6.lmaa.opt_code",
         FT_UINT8, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
     { &hf_mip6_lmaa_reserved,
-      { "Reserved", "mmip6.lmaa.reserved",
+      { "Reserved", "mip6.lmaa.reserved",
         FT_UINT8, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 46506343f1..1caccb6e83 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -3901,57 +3901,57 @@ proto_register_ssl(void)
             "Server's challenge to client", HFILL }
         },
         { &hf_pct_handshake_cipher_spec,
-          { "Cipher Spec", "pct.handshake.cipherspec",
+          { "Cipher Spec", "ssl.pct.handshake.cipherspec",
             FT_NONE, BASE_NONE, NULL, 0x0,
             "PCT Cipher specification", HFILL }
         },
         { &hf_pct_handshake_cipher,
-          { "Cipher", "pct.handshake.cipher",
+          { "Cipher", "ssl.pct.handshake.cipher",
             FT_UINT16, BASE_HEX, VALS(pct_cipher_type), 0x0,
             "PCT Ciper", HFILL }
         },
         { &hf_pct_handshake_hash_spec,
-          { "Hash Spec", "pct.handshake.hashspec",
+          { "Hash Spec", "ssl.pct.handshake.hashspec",
             FT_NONE, BASE_NONE, NULL, 0x0,
             "PCT Hash specification", HFILL }
         },
         { &hf_pct_handshake_hash,
-          { "Hash", "pct.handshake.hash",
+          { "Hash", "ssl.pct.handshake.hash",
             FT_UINT16, BASE_HEX, VALS(pct_hash_type), 0x0,
             "PCT Hash", HFILL }
         },
         { &hf_pct_handshake_cert_spec,
-          { "Cert Spec", "pct.handshake.certspec",
+          { "Cert Spec", "ssl.pct.handshake.certspec",
             FT_NONE, BASE_NONE, NULL, 0x0,
             "PCT Certificate specification", HFILL }
         },
         { &hf_pct_handshake_cert,
-          { "Cert", "pct.handshake.cert",
+          { "Cert", "ssl.pct.handshake.cert",
             FT_UINT16, BASE_HEX, VALS(pct_cert_type), 0x0,
             "PCT Certificate", HFILL }
         },
         { &hf_pct_handshake_exch_spec,
-          { "Exchange Spec", "pct.handshake.exchspec",
+          { "Exchange Spec", "ssl.pct.handshake.exchspec",
             FT_NONE, BASE_NONE, NULL, 0x0,
             "PCT Exchange specification", HFILL }
         },
         { &hf_pct_handshake_exch,
-          { "Exchange", "pct.handshake.exch",
+          { "Exchange", "ssl.pct.handshake.exch",
             FT_UINT16, BASE_HEX, VALS(pct_exch_type), 0x0,
             "PCT Exchange", HFILL }
         },
         { &hf_pct_handshake_sig,
-          { "Sig Spec", "pct.handshake.sig",
+          { "Sig Spec", "ssl.pct.handshake.sig",
             FT_UINT16, BASE_HEX, VALS(pct_sig_type), 0x0,
             "PCT Signature", HFILL }
         },
         { &hf_pct_msg_error_type,
-          { "PCT Error Code", "pct.msg_error_code",
+          { "PCT Error Code", "ssl.pct.msg_error_code",
             FT_UINT16, BASE_HEX, VALS(pct_error_code), 0x0,
             NULL, HFILL }
         },
         { &hf_pct_handshake_server_cert,
-          { "Server Cert", "pct.handshake.server_cert",
+          { "Server Cert", "ssl.pct.handshake.server_cert",
             FT_BYTES, BASE_NONE, NULL , 0x0,
             "PCT Server Certificate", HFILL }
         },
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index 48ae32e155..ba1fbc90c0 100644
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -6651,19 +6651,19 @@ proto_register_tn3270(void)
          NULL, HFILL }
     },
     { &hf_tn3270_cs_form_type1,
-      { "18-byte form; the first 2 bytes contain a 16-bit vertical slice,"
-        " the following 16 bytes contain 8-bit horizontal slices. For a 9"
-        " x 12 character matrix the last 4 bytes contain binary zero.",
+      { "18-byte form",
         "tn3270.cs_form_type1",
-        FT_BOOLEAN, 8, NULL, 0x80,
+        FT_BOOLEAN, 8, "the first 2 bytes contain a 16-bit vertical slice,"
+        " the following 16 bytes contain 8-bit horizontal slices. For a 9"
+        " x 12 character matrix the last 4 bytes contain binary zero.", 0x80,
         NULL, HFILL }
     },
     { &hf_tn3270_cs_form_type2,
-      { "18-byte form; the first 2 bytes contain a 16-bit vertical slice,"
-        " the following 16 bytes contain 8-bit horizontal slices. For a 9"
-        " x 12 character matrix the last 4 bytes contain binary zero. (COMPRESSED)",
+      { "18-byte form (COMPRESSED)",
         "tn3270.cs_form_type2",
-        FT_BOOLEAN, 8, NULL, 0x40,
+        FT_BOOLEAN, 8, "the first 2 bytes contain a 16-bit vertical slice,"
+        " the following 16 bytes contain 8-bit horizontal slices. For a 9"
+        " x 12 character matrix the last 4 bytes contain binary zero. (COMPRESSED)", 0x40,
         NULL, HFILL }
     },
     { &hf_tn3270_cs_form_type3,
@@ -7470,17 +7470,15 @@ proto_register_tn3270(void)
          NULL, HFILL }
     },
     { &hf_tn3270_ua_xr,
-      {  "Distance between points in X direction as a fraction, measured in UNITS, with 2-byte"
-         " numerator and 2-byte denominator",
+      {  "Distance between points in X direction as a fraction",
          "tn3270.ua_xr",
-         FT_UINT32, BASE_HEX, NULL, 0x0,
+         FT_UINT32, BASE_HEX, "measured in UNITS, with 2-byte numerator and 2-byte denominator", 0x0,
          NULL, HFILL }
     },
     { &hf_tn3270_ua_yr,
-      {  "Distance between points in Y direction as a fraction, measured in UNITS, with 2-byte"
-         " numerator and 2-byte denominator",
+      {  "Distance between points in Y direction as a fraction",
          "tn3270.ua_xr",
-         FT_UINT32, BASE_HEX, NULL, 0x0,
+         FT_UINT32, BASE_HEX, "measured in UNITS, with 2-byte numerator and 2-byte denominator", 0x0,
          NULL, HFILL }
     },
     { &hf_tn3270_ua_aw,