Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748

1 files changed, 40 insertions, 40 deletions

diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c
index e9dcc39da1..e44c3880bc 100644
--- a/epan/dissectors/packet-HI2Operations.c
+++ b/epan/dissectors/packet-HI2Operations.c
@@ -3817,7 +3817,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_iRIversion,
       { "iRIversion", "HI2Operations.iRIversion",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_iRIversion_vals), 0,
-        "T_iRIversion", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_lawfulInterceptionIdentifier,
       { "lawfulInterceptionIdentifier", "HI2Operations.lawfulInterceptionIdentifier",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -3833,7 +3833,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_intercepted_Call_Direct,
       { "intercepted-Call-Direct", "HI2Operations.intercepted_Call_Direct",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_intercepted_Call_Direct_vals), 0,
-        "T_intercepted_Call_Direct", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_intercepted_Call_State,
       { "intercepted-Call-State", "HI2Operations.intercepted_Call_State",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_Intercepted_Call_State_vals), 0,
@@ -3861,7 +3861,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_callContentLinkInformation,
       { "callContentLinkInformation", "HI2Operations.callContentLinkInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_callContentLinkInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_cCLink1Characteristics,
       { "cCLink1Characteristics", "HI2Operations.cCLink1Characteristics",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -3877,7 +3877,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_nature_Of_The_intercepted_call,
       { "nature-Of-The-intercepted-call", "HI2Operations.nature_Of_The_intercepted_call",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_nature_Of_The_intercepted_call_vals), 0,
-        "T_nature_Of_The_intercepted_call", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_serverCenterAddress,
       { "serverCenterAddress", "HI2Operations.serverCenterAddress",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4029,15 +4029,15 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_winterSummerIndication,
       { "winterSummerIndication", "HI2Operations.winterSummerIndication",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_winterSummerIndication_vals), 0,
-        "T_winterSummerIndication", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_party_Qualifier,
       { "party-Qualifier", "HI2Operations.party_Qualifier",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_party_Qualifier_vals), 0,
-        "T_party_Qualifier", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_partyIdentity,
       { "partyIdentity", "HI2Operations.partyIdentity",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_partyIdentity", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_imei,
       { "imei", "HI2Operations.imei",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -4129,7 +4129,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_ms_Loc,
       { "ms-Loc", "HI2Operations.ms_Loc",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_ms_Loc", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_mcc,
       { "mcc", "HI2Operations.mcc",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -4153,7 +4153,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_geoCoordinates,
       { "geoCoordinates", "HI2Operations.geoCoordinates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_geoCoordinates", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_latitude,
       { "latitude", "HI2Operations.latitude",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4173,7 +4173,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_utmCoordinates,
       { "utmCoordinates", "HI2Operations.utmCoordinates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_utmCoordinates", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_utm_East,
       { "utm-East", "HI2Operations.utm_East",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4185,7 +4185,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_utmRefCoordinates,
       { "utmRefCoordinates", "HI2Operations.utmRefCoordinates",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_utmRefCoordinates", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_utmref_string,
       { "utmref-string", "HI2Operations.utmref_string",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4209,7 +4209,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_latitudeSign,
       { "latitudeSign", "HI2Operations.latitudeSign",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_latitudeSign_vals), 0,
-        "T_latitudeSign", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_latitude_01,
       { "latitude", "HI2Operations.latitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -4229,7 +4229,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_GA_Polygon_item,
       { "GA-Polygon item", "HI2Operations.GA_Polygon_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "GA_Polygon_item", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_cCLink_State,
       { "cCLink-State", "HI2Operations.cCLink_State",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_CCLink_State_vals), 0,
@@ -4321,7 +4321,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_Non_Standard_Supplementary_Services_item,
       { "Non-Standard-Supplementary-Services item", "HI2Operations.Non_Standard_Supplementary_Services_item",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_Non_Standard_Supplementary_Services_item_vals), 0,
-        "Non_Standard_Supplementary_Services_item", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_simpleIndication,
       { "simpleIndication", "HI2Operations.simpleIndication",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_SimpleIndication_vals), 0,
@@ -4373,19 +4373,19 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_sMS_Contents,
       { "sMS-Contents", "HI2Operations.sMS_Contents",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_sMS_Contents", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_initiator,
       { "initiator", "HI2Operations.initiator",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_initiator_vals), 0,
-        "T_initiator", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_transfer_status,
       { "transfer-status", "HI2Operations.transfer_status",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_transfer_status_vals), 0,
-        "T_transfer_status", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_other_message,
       { "other-message", "HI2Operations.other_message",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_other_message_vals), 0,
-        "T_other_message", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_content,
       { "content", "HI2Operations.content",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -4421,7 +4421,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_iP_type,
       { "iP-type", "HI2Operations.iP_type",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_iP_type_vals), 0,
-        "T_iP_type", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_iP_value,
       { "iP-value", "HI2Operations.iP_value",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_IP_value_vals), 0,
@@ -4429,7 +4429,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_iP_assignment,
       { "iP-assignment", "HI2Operations.iP_assignment",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_iP_assignment_vals), 0,
-        "T_iP_assignment", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_iPBinaryAddress,
       { "iPBinaryAddress", "HI2Operations.iPBinaryAddress",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -4461,7 +4461,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_both_IRI_CC,
       { "both-IRI-CC", "HI2Operations.both_IRI_CC",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_both_IRI_CC", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_iri_CC,
       { "iri-CC", "HI2Operations.iri_CC",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4473,7 +4473,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_cc,
       { "cc", "HI2Operations.cc",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_cc", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_cc_item,
       { "cc item", "HI2Operations.cc_item",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -4561,7 +4561,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved0,
       { "reserved0", "HI2Operations.reserved0",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_origination,
       { "origination", "HI2Operations.origination",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4569,7 +4569,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved1,
       { "reserved1", "HI2Operations.reserved1",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_redirection,
       { "redirection", "HI2Operations.redirection",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4581,7 +4581,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved2,
       { "reserved2", "HI2Operations.reserved2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_terminationattempt,
       { "terminationattempt", "HI2Operations.terminationattempt",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4589,7 +4589,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved,
       { "reserved", "HI2Operations.reserved",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_ccchange,
       { "ccchange", "HI2Operations.ccchange",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4597,15 +4597,15 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved3,
       { "reserved3", "HI2Operations.reserved3",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_reserved4,
       { "reserved4", "HI2Operations.reserved4",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_reserved5,
       { "reserved5", "HI2Operations.reserved5",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_networksignal,
       { "networksignal", "HI2Operations.networksignal",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4665,7 +4665,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_ccOpenOption,
       { "ccOpenOption", "HI2Operations.ccOpenOption",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_ccOpenOption_vals), 0,
-        "T_ccOpenOption", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_ccOpenTime,
       { "ccOpenTime", "HI2Operations.ccOpenTime",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -4701,7 +4701,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_input,
       { "input", "HI2Operations.input",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_input_vals), 0,
-        "T_input", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_userinput,
       { "userinput", "HI2Operations.userinput",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4749,7 +4749,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_signal,
       { "signal", "HI2Operations.signal",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signal", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_switchhookFlash,
       { "switchhookFlash", "HI2Operations.switchhookFlash",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4785,7 +4785,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_sepCCCpair,
       { "sepCCCpair", "HI2Operations.sepCCCpair",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_sepCCCpair", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_sepXmitCCC,
       { "sepXmitCCC", "HI2Operations.sepXmitCCC",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4805,11 +4805,11 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved6,
       { "reserved6", "HI2Operations.reserved6",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_reserved7,
       { "reserved7", "HI2Operations.reserved7",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_ipAddress_01,
       { "ipAddress", "HI2Operations.ipAddress",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4817,7 +4817,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved8,
       { "reserved8", "HI2Operations.reserved8",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_trunkId,
       { "trunkId", "HI2Operations.trunkId",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4825,7 +4825,7 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_reserved9,
       { "reserved9", "HI2Operations.reserved9",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_genericAddress,
       { "genericAddress", "HI2Operations.genericAddress",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -4953,15 +4953,15 @@ void proto_register_HI2Operations(void) {
     { &hf_HI2Operations_callRelation,
       { "callRelation", "HI2Operations.callRelation",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_callRelation_vals), 0,
-        "T_callRelation", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_direction_01,
       { "direction", "HI2Operations.direction",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_direction_vals), 0,
-        "T_direction", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_scope,
       { "scope", "HI2Operations.scope",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_scope_vals), 0,
-        "T_scope", HFILL }},
+        NULL, HFILL }},
     { &hf_HI2Operations_cPlaneData,
       { "cPlaneData", "HI2Operations.cPlaneData",
         FT_BYTES, BASE_NONE, NULL, 0,