Fix instances of duplicate display-filter-names with incompatible types.

Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef
Note: Some of the filters, when/if used, could have caused Wireshark crashes.
Reviewed-on: https://code.wireshark.org/review/5575
Reviewed-by: Bill Meier <wmeier@newsguy.com>

4 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index 6c1c05ab06..79223260a1 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -1238,12 +1238,12 @@ proto_register_adwin(void)
 		    NULL, HFILL }
 		},
 		{ &hf_adwin_data_no16,
-		  { "Data No. (16bit)", "adwin.data",
+		  { "Data No. (16bit)", "adwin.data_no16",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_adwin_data_no32,
-		  { "Data No. (32bit)", "adwin.data",
+		  { "Data No. (32bit)", "adwin.data_no32",
 		    FT_UINT32, BASE_DEC, NULL, 0x0,
 		    NULL, HFILL }
 		},
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 56074b9d7e..10fc78ab1a 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -7148,7 +7148,7 @@ proto_register_bgp(void)
         {"mLDP P2MP FEC element root node address", "bgp.update.path_attribute.pmsi.mldp.fec.root_nodev4", FT_IPv4, BASE_NONE,
          NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_pmsi_tunnel_mldp_fec_el_root_nodev6,
-        {"mLDP P2MP FEC element root node address", "bgp.update.path_attribute.pmsi.mldp.fec.root_nodev4", FT_IPv6, BASE_NONE,
+        {"mLDP P2MP FEC element root node address", "bgp.update.path_attribute.pmsi.mldp.fec.root_nodev6", FT_IPv6, BASE_NONE,
          NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_pmsi_tunnel_mldp_fec_el_opa_len,
         {"mLDP P2MP FEC element opaque length", "bgp.update.path_attribute.pmsi.mldp.fec.opaque_length", FT_UINT16, BASE_DEC,
@@ -7792,7 +7792,7 @@ proto_register_bgp(void)
         { "Administrative group (color) TLV", "bgp.ls.tlv.administrative_group_color", FT_NONE,
           BASE_NONE, NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ls_tlv_administrative_group_color_value,
-        { "Group Mask", "bgp.ls.tlv.administrative_group_color", FT_UINT32,
+        { "Group Mask", "bgp.ls.tlv.administrative_group_color_value", FT_UINT32,
          BASE_DEC, NULL, 0xffff, NULL, HFILL}},
       { &hf_bgp_ls_tlv_max_link_bandwidth,
         { "Maximum link bandwidth TLV", "bgp.ls.tlv.maximum_link_bandwidth", FT_NONE,
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index ea38a2ed59..3d141eb89e 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -3314,35 +3314,35 @@ proto_register_h264(void)
         },
 #endif
         { &hf_h264_par_profile,
-                { "Profile", "h264.profile",
+                { "Profile", "h264.par_profile",
                 FT_UINT8, BASE_HEX, NULL, 0x00,
             NULL, HFILL}},
         { &hf_h264_par_profile_b,
-                { "Baseline Profile", "h264.profile.base",
+                { "Baseline Profile", "h264.par_profile.base",
             FT_BOOLEAN, 8, NULL, 0x40,
             NULL, HFILL}},
         { &hf_h264_par_profile_m,
-                { "Main Profile", "h264.profile.main",
+                { "Main Profile", "h264.par_profile.main",
             FT_BOOLEAN, 8, NULL, 0x20,
             NULL, HFILL}},
         { &hf_h264_par_profile_e,
-                { "Extended Profile.", "h264.profile.ext",
+                { "Extended Profile.", "h264.par_profile.ext",
             FT_BOOLEAN, 8, NULL, 0x10,
             NULL, HFILL}},
         { &hf_h264_par_profile_h,
-                { "High Profile", "h264.profile.high",
+                { "High Profile", "h264.par_profile.high",
             FT_BOOLEAN, 8, NULL, 0x08,
             NULL, HFILL}},
         { &hf_h264_par_profile_h10,
-                { "High 10 Profile", "h264.profile.high10",
+                { "High 10 Profile", "h264.par_profile.high10",
             FT_BOOLEAN, 8, NULL, 0x04,
             NULL, HFILL}},
         { &hf_h264_par_profile_h4_2_2,
-                { "High 4:2:2 Profile", "h264.profile.high4_2_2",
+                { "High 4:2:2 Profile", "h264.par_profile.high4_2_2",
             FT_BOOLEAN, 8, NULL, 0x02,
             NULL, HFILL}},
         { &hf_h264_par_profile_h4_4_4,
-                { "High 4:4:4 Profile", "h264.profile.high4_4_4",
+                { "High 4:4:4 Profile", "h264.par_profile.high4_4_4",
             FT_BOOLEAN, 8, NULL, 0x01,
             NULL, HFILL}},
         { &hf_h264_par_AdditionalModesSupported,
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index f9c382b1af..6ee274e2b8 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -10090,17 +10090,17 @@ proto_register_pn_io (void)
         NULL, HFILL }
     },  /* XXX - 16 bitfield!*/
     { &hf_pn_io_api_tree,
-      { "API", "pn_io.api",
+      { "API", "pn_io.api_tree",
         FT_NONE, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_pn_io_module_tree,
-      { "Module", "pn_io.module",
+      { "Module", "pn_io.module_tree",
         FT_NONE, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_pn_io_submodule_tree,
-      { "Submodule", "pn_io.submodule",
+      { "Submodule", "pn_io.submodule_tree",
         FT_NONE, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
@@ -10667,7 +10667,7 @@ proto_register_pn_io (void)
         NULL, HFILL }
     },
     { &hf_pn_io_data_description_tree,
-      { "DataDescription", "pn_io.data_description",
+      { "DataDescription", "pn_io.data_description_tree",
         FT_NONE, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
@@ -11954,7 +11954,7 @@ proto_register_pn_io (void)
         NULL, HFILL }
     },
     { &hf_pn_io_profidrive_param_value_float,
-      { "Value", "pn_io.profidrive.parameter.value_dw",
+      { "Value", "pn_io.profidrive.parameter.value_float",
         FT_FLOAT, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },