Fix some duplicate display filter names.
authorcmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 18 Jan 2012 21:07:53 +0000 (21:07 +0000)
committercmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 18 Jan 2012 21:07:53 +0000 (21:07 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40568 f5534014-38df-0310-8fa8-9805f1628bb7

asn1/ansi_map/packet-ansi_map-template.c
epan/dissectors/packet-9p.c
epan/dissectors/packet-ansi_map.c
epan/dissectors/packet-aoe.c
epan/dissectors/packet-babel.c

index 6f20ec10513a614e632686a63713eb0c67c954f9..80b8df741eee0b7869bcb80728ef04774ab50711 100644 (file)
@@ -4608,7 +4608,7 @@ void proto_register_ansi_map(void) {
             FT_UINT8, BASE_DEC, NULL,0x0,
             NULL, HFILL }},
         { &hf_ansi_map_tmn,
-          { "Trunk Member Number (M)", "ansi_map.tgn",
+          { "Trunk Member Number (M)", "ansi_map.tmn",
             FT_UINT8, BASE_DEC, NULL,0x0,
             NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationcount_tom,
@@ -4830,7 +4830,7 @@ void proto_register_ansi_map(void) {
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
             NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_uscfnrfa,
-          { "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", "ansi_map.callingfeaturesindicator.uscfmsfa",
+          { "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", "ansi_map.callingfeaturesindicator.uscfnrfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
             NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cpdsfa,
@@ -5025,7 +5025,7 @@ void proto_register_ansi_map(void) {
             FT_UINT8, BASE_DEC, NULL, 0x07,
             NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_chno,
-          { "Channel Number (CHNO)", "ansi_map.controlchanneldata.cmac",
+          { "Channel Number (CHNO)", "ansi_map.controlchanneldata.chno",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_sdcc1,
@@ -5056,7 +5056,7 @@ void proto_register_ansi_map(void) {
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_all_bool_val),0x01,
             NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_local,
-          { "Local", "ansi_map.originationtriggers.all",
+          { "Local", "ansi_map.originationtriggers.local",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_local_bool_val),0x02,
             NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_ilata,
@@ -5202,7 +5202,7 @@ void proto_register_ansi_map(void) {
             NULL, HFILL }},
 
         { &hf_ansi_map_triggercapability_ct ,
-          { "Call Types (CT)", "ansi_map.triggercapability.ona",
+          { "Call Types (CT)", "ansi_map.triggercapability.ct",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01,
             NULL, HFILL }},
         { &hf_ansi_map_triggercapability_unrec,
@@ -5230,7 +5230,7 @@ void proto_register_ansi_map(void) {
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x40,
             NULL, HFILL }},
         { &hf_ansi_map_triggercapability_obsy,
-          { "O_Called_Party_Busy (OBSY)", "ansi_map.triggercapability.ona",
+          { "O_Called_Party_Busy (OBSY)", "ansi_map.triggercapability.obsy",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x80,
             NULL, HFILL }},
 
index 9245d5103bf1bfb66925fd7e10a74150d0014e06..6343007f1baa553e57a19aab9e60ffd95f833a21 100644 (file)
@@ -755,7 +755,7 @@ void proto_register_9P(void)
                 {"Version", "9p.version", FT_STRING, BASE_NONE, NULL, 0x0,
                  NULL, HFILL}},
                {&hf_9P_afid,
-                {"Afid", "9p.fid", FT_UINT32, BASE_DEC, NULL, 0x0,
+                {"Afid", "9p.afid", FT_UINT32, BASE_DEC, NULL, 0x0,
                  "Authenticating FID", HFILL}},
                {&hf_9P_uname,
                 {"Uname", "9p.uname", FT_STRING, BASE_NONE, NULL, 0x0,
index aa86783b18bb3ab134bcab0148ce6ce99ca30f47..5af8ca3d04053ca723833b0edf3e95d98849a4fc 100644 (file)
@@ -16490,7 +16490,7 @@ void proto_register_ansi_map(void) {
             FT_UINT8, BASE_DEC, NULL,0x0,
             NULL, HFILL }},
         { &hf_ansi_map_tmn,
-          { "Trunk Member Number (M)", "ansi_map.tgn",
+          { "Trunk Member Number (M)", "ansi_map.tmn",
             FT_UINT8, BASE_DEC, NULL,0x0,
             NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationcount_tom,
@@ -16712,7 +16712,7 @@ void proto_register_ansi_map(void) {
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
             NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_uscfnrfa,
-          { "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", "ansi_map.callingfeaturesindicator.uscfmsfa",
+          { "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", "ansi_map.callingfeaturesindicator.uscfnrfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
             NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cpdsfa,
@@ -16907,7 +16907,7 @@ void proto_register_ansi_map(void) {
             FT_UINT8, BASE_DEC, NULL, 0x07,
             NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_chno,
-          { "Channel Number (CHNO)", "ansi_map.controlchanneldata.cmac",
+          { "Channel Number (CHNO)", "ansi_map.controlchanneldata.chno",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_sdcc1,
@@ -16938,7 +16938,7 @@ void proto_register_ansi_map(void) {
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_all_bool_val),0x01,
             NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_local,
-          { "Local", "ansi_map.originationtriggers.all",
+          { "Local", "ansi_map.originationtriggers.local",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_local_bool_val),0x02,
             NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_ilata,
@@ -17084,7 +17084,7 @@ void proto_register_ansi_map(void) {
             NULL, HFILL }},
 
         { &hf_ansi_map_triggercapability_ct ,
-          { "Call Types (CT)", "ansi_map.triggercapability.ona",
+          { "Call Types (CT)", "ansi_map.triggercapability.ct",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01,
             NULL, HFILL }},
         { &hf_ansi_map_triggercapability_unrec,
@@ -17112,7 +17112,7 @@ void proto_register_ansi_map(void) {
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x40,
             NULL, HFILL }},
         { &hf_ansi_map_triggercapability_obsy,
-          { "O_Called_Party_Busy (OBSY)", "ansi_map.triggercapability.ona",
+          { "O_Called_Party_Busy (OBSY)", "ansi_map.triggercapability.obsy",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x80,
             NULL, HFILL }},
 
index c82c6047f6c13831ed02820a3cd4cdef9a604ed1..71b67dfcf2d508a457d2c83992e36d255e3640c9 100644 (file)
@@ -439,7 +439,7 @@ proto_register_aoe(void)
     { &hf_aoe_flags_response,
       { "Response flag", "aoe.response", FT_BOOLEAN, 8, TFS(&tfs_response), AOE_FLAGS_RESPONSE, "Whether this is a response PDU or not", HFILL}},
     { &hf_aoe_flags_error,
-      { "Error flag", "aoe.error", FT_BOOLEAN, 8, TFS(&tfs_error), AOE_FLAGS_ERROR, "Whether this is an error PDU or not", HFILL}},
+      { "Error flag", "aoe.flags_error", FT_BOOLEAN, 8, TFS(&tfs_error), AOE_FLAGS_ERROR, "Whether this is an error PDU or not", HFILL}},
     { &hf_aoe_major,
       { "Major", "aoe.major", FT_UINT16, BASE_HEX, NULL, 0x0,
        "Major address", HFILL}},
index 84a83d9e94a97ce105ca207c61ebb6958a5ecad0..856c78d631c69112e5052a481476e032e5a54bbc 100644 (file)
@@ -486,7 +486,7 @@ proto_register_babel(void)
            NULL, 0, NULL, HFILL }
         },
         { &hf_babel_message_hopcount,
-          { "Hop Count", "babel.message.omitted", FT_UINT8, BASE_DEC,
+          { "Hop Count", "babel.message.hopcount", FT_UINT8, BASE_DEC,
             NULL, 0, NULL, HFILL }
         },
     };