Fix some duplicate display filter names.

svn path=/trunk/; revision=40672

diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index fa2e3f0995cf6810ced02aa3f02ec23fe740e634..3e6df9a9b9e3184194083e2b57428462cea5cbfd 100644 (file)
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -1188,7 +1188,7 @@ proto_register_t30(void)
             { "Ready to transmit a character or mixed mode document (polling)", "t30.fif.rttcmmd", FT_BOOLEAN,  8,
               TFS(&tfs_set_notset), 0x20, NULL, HFILL }},
         {  &hf_t30_fif_chrm,
-            { "Character mode", "t30.fif.cm", FT_BOOLEAN,  8,
+            { "Character mode", "t30.fif.chrm", FT_BOOLEAN,  8,
               TFS(&tfs_set_notset), 0x10, NULL, HFILL }},
         {  &hf_t30_fif_mm,
             { "Mixed mode (Annex E/T.4)", "t30.fif.mm", FT_BOOLEAN,  8,

diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c
index 500de7287ddca830ae342f4757749f4d10b39916..fd7557bd4485904ba39ab06d8877d4548a0fb1e6 100644 (file)
--- a/epan/dissectors/packet-tdmoe.c
+++ b/epan/dissectors/packet-tdmoe.c
@@ -138,7 +138,7 @@ proto_register_tdmoe(void)
                { "Yellow Alarm", "tdmoe.yellowalarm", FT_BOOLEAN, 8, NULL, TDMOE_YELLOW_ALARM_BITMASK,
                        NULL, HFILL }},
                { &hf_tdmoe_sig_bits_present,
-               { "Sig bits present", "tdmoe.sig_bits", FT_BOOLEAN, 8, NULL, TDMOE_SIGBITS_BITMASK,
+               { "Sig bits present", "tdmoe.sig_bits_present", FT_BOOLEAN, 8, NULL, TDMOE_SIGBITS_BITMASK,
                        NULL, HFILL }},
                { &hf_tdmoe_packet_counter,
                { "Counter", "tdmoe.counter", FT_UINT16, BASE_DEC, NULL, 0x0,

diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index 5a6ba7bf574b7f1dcdb2f26e4aad40a91e39f3b9..cfae6f31ad3d1983d353681e0131ef87e0d4b809 100644 (file)
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -5230,7 +5230,7 @@ proto_register_tn3270(void)
         FT_UINT8, BASE_HEX, VALS(vals_color_identifications), 0x0,
         NULL, HFILL }},
     { &hf_tn3270_character_set,
-      { "Character Set",           "tn3270.color",
+      { "Character Set",           "tn3270.character_set",
         FT_UINT8, BASE_HEX, RVALS(rvals_character_set), 0x0,
         NULL, HFILL }},
     { &hf_tn3270_field_outlining,

diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c
index e5dd579b4dc62727be213d1c5963493b8bb9af56..2a041e4a1f630ce5b0a96dc6a58d0c121690c63b 100644 (file)
--- a/epan/dissectors/packet-tn5250.c
+++ b/epan/dissectors/packet-tn5250.c
@@ -5654,7 +5654,7 @@ proto_register_tn5250(void)
         FT_BOOLEAN, 8, TFS(&tn5250_field_wdsf_ds_flag2_6),
         0x20, NULL, HFILL }},
     { &hf_tn5250_wdsf_ds_flag2_reserved,
-      { "Reserved", "tn5250.wdsf_ds_flag3_reserved", FT_UINT8, BASE_HEX,
+      { "Reserved", "tn5250.wdsf_ds_flag2_reserved", FT_UINT8, BASE_HEX,
         NULL, 0xC0, NULL, HFILL }},
 
     { &hf_tn5250_wdsf_ds_flag3,
@@ -5685,7 +5685,7 @@ proto_register_tn5250(void)
       { "Reserved", "tn5250.wdsf_ds_gdc_reserved", FT_BOOLEAN, 8,
         NULL, 0x10, NULL, HFILL }},
     { &hf_tn5250_wdsf_ds_gdc_selection_techniques,
-      { "Selection Techniques", "tn5250.wdsf_ds_selection_techniques", FT_UINT8, BASE_HEX,
+      { "Selection Techniques", "tn5250.wdsf_ds_gdc_selection_techniques", FT_UINT8, BASE_HEX,
         VALS(vals_tn5250_wdsf_ds_gdc_selection_techniques), DS_SELECTION_TECHNIQUES_BITS, NULL, HFILL }},
 
     { &hf_tn5250_wdsf_ds_nws,
@@ -5699,11 +5699,11 @@ proto_register_tn5250(void)
       { "Reserved", "tn5250.wdsf_ds_nws_reserved", FT_BOOLEAN, 8,
         NULL, 0x10, NULL, HFILL }},
     { &hf_tn5250_wdsf_ds_nws_selection_techniques,
-      { "Selection Techniques", "tn5250.wdsf_ds_selection_techniques", FT_UINT8, BASE_HEX,
+      { "Selection Techniques", "tn5250.wdsf_ds_nws_selection_techniques", FT_UINT8, BASE_HEX,
         VALS(vals_tn5250_wdsf_ds_nws_selection_techniques), DS_NWS_SELECTION_TECHNIQUES_BITS, NULL, HFILL }},
 
     { &hf_tn5250_wdsf_ds_nws_wout,
-      { "NWS Without Mnemonic Underscore Characteristics", "tn5250.wdsf_ds_nws",
+      { "NWS Without Mnemonic Underscore Characteristics", "tn5250.wdsf_ds_nws_wout",
         FT_UINT8, BASE_HEX, NULL, 0,
         NULL, HFILL }},
     /* hf_tn5250_wdsf_ds_nws_wout uses same bitfields as hf_tn5250_wdsf_ds_nws */
@@ -6545,7 +6545,7 @@ proto_register_tn5250(void)
       { "Flag", "tn5250.wssf_ttw_flag",
         FT_UINT8, BASE_HEX, VALS(vals_tn5250_wssf_ttw_flag), 0,
         NULL, HFILL }},
-    /* XXX - the document says "Currently, this command is designed 
+    /* XXX - the document says "Currently, this command is designed
        only to pass ASCII data to some type of ASCII device."; should it
        be treated as an ASCII string? */
     { &hf_tn5250_wssf_ttw_data,
@@ -6776,7 +6776,7 @@ proto_register_tn5250(void)
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_tn5250_dtsf_text_body_width,
-      { "Text Body Width", "tn5250.dtsf_text_body_height",
+      { "Text Body Width", "tn5250.dtsf_text_body_width",
         FT_UINT16, BASE_DEC, NULL, 0,
         NULL, HFILL }},
 
@@ -6882,7 +6882,7 @@ proto_register_tn5250(void)
         FT_BOOLEAN, 8, TFS(&tn5250_field_wts_flag2_6),
         0x20, NULL, HFILL }},
     { &hf_tn5250_wts_flag2_reserved2,
-      { "Reserved", "tn5250.wts_flag2_reserved", FT_UINT8, BASE_HEX,
+      { "Reserved", "tn5250.wts_flag2_reserved2", FT_UINT8, BASE_HEX,
         NULL, 0xC0, NULL, HFILL }},
 
     { &hf_tn5250_wts_flag3,

diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 6f4495b31ad311749178bedf24098af7d2a78cd2..ac95e1ee701f46a0e220e23ed117277260507b69 100644 (file)
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -2026,12 +2026,12 @@ proto_register_uma(void)
                        NULL, HFILL }
                },
                { &hf_uma_urr_dis_rej_cau,
-                       { "Discovery Reject Cause","uma.urr.is_rej_cau",
+                       { "Discovery Reject Cause","uma.urr.dis_rej_cau",
                        FT_UINT8,BASE_DEC,  VALS(uma_discovery_reject_cause_vals), 0x0,
                        NULL, HFILL }
                },
                { &hf_uma_urr_ECMC,
-                       { "ECMC, Early Classmark Sending Control","uma.urr.is_rej_cau",
+                       { "ECMC, Early Classmark Sending Control","uma.urr.ECMC",
                        FT_UINT8,BASE_DEC,  VALS(ECMC_vals), 0x2,
                        NULL, HFILL }
                },
@@ -2041,7 +2041,7 @@ proto_register_uma(void)
                        NULL, HFILL }
                },
                { &hf_uma_urr_GPRS,
-                       { "GPRS, GPRS Availability","uma.urr.is_rej_cau",
+                       { "GPRS, GPRS Availability","uma.urr.GPRS",
                        FT_UINT8,BASE_DEC,  VALS(GPRS_avail_vals), 0x10,
                        NULL, HFILL }
                },
@@ -2131,7 +2131,7 @@ proto_register_uma(void)
                        NULL, HFILL }
                },
                { &hf_uma_urr_register_reject_cause,
-                       { "Register Reject Cause","uma.urr.state",
+                       { "Register Reject Cause","uma.urr.reg_rej_cau",
                        FT_UINT8,BASE_DEC|BASE_EXT_STRING,  &register_reject_cause_vals_ext, 0x0,
                        NULL, HFILL }
                },
@@ -2256,7 +2256,7 @@ proto_register_uma(void)
                        NULL, HFILL }
                },
                { &hf_uma_urr_channel,
-                       { "Channel","uma.urr.establishment_cause",
+                       { "Channel","uma.urr.channel",
                        FT_UINT8,BASE_DEC,  VALS(channel_vals), 0x3,
                        NULL, HFILL }
                },
@@ -2271,7 +2271,7 @@ proto_register_uma(void)
                        NULL, HFILL }
                },
                { &hf_uma_urr_payload_type,
-                       { "Payload Type","uma.urr.sample_size",
+                       { "Payload Type","uma.urr.payload_type",
                        FT_UINT8,BASE_DEC,  NULL, 0x0,
                        NULL, HFILL }
                },
@@ -2386,7 +2386,7 @@ proto_register_uma(void)
                        NULL, HFILL }
                },
                { &hf_uma_urr_UNC_tcp_port,
-                       { "UNC TCP port","uma.urr.gprs_port",
+                       { "UNC TCP port","uma.urr.tcp_port",
                        FT_UINT16,BASE_DEC,  NULL, 0x0,
                        "UDP Port for GPRS user data transport", HFILL }
                },