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, 26 insertions, 26 deletions

diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 6f16a3df03..339ac95abb 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2317,7 +2317,7 @@ void proto_register_dop(void) {
     { &hf_dop_agreement,
       { "agreement", "dop.agreement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_agreement", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_valid,
       { "valid", "dop.valid",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2333,7 +2333,7 @@ void proto_register_dop(void) {
     { &hf_dop_signedEstablishOperationalBindingArgument,
       { "signedEstablishOperationalBindingArgument", "dop.signedEstablishOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedEstablishOperationalBindingArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_establishOperationalBindingArgument,
       { "establishOperationalBindingArgument", "dop.establishOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2349,19 +2349,19 @@ void proto_register_dop(void) {
     { &hf_dop_identifier,
       { "identifier", "dop.identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "T_identifier", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_version,
       { "version", "dop.version",
         FT_INT32, BASE_DEC, NULL, 0,
-        "T_version", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_validFrom,
       { "validFrom", "dop.validFrom",
         FT_UINT32, BASE_DEC, VALS(dop_T_validFrom_vals), 0,
-        "T_validFrom", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_now,
       { "now", "dop.now",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_time,
       { "time", "dop.time",
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
@@ -2369,11 +2369,11 @@ void proto_register_dop(void) {
     { &hf_dop_validUntil,
       { "validUntil", "dop.validUntil",
         FT_UINT32, BASE_DEC, VALS(dop_T_validUntil_vals), 0,
-        "T_validUntil", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_explicitTermination,
       { "explicitTermination", "dop.explicitTermination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_utcTime,
       { "utcTime", "dop.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -2385,19 +2385,19 @@ void proto_register_dop(void) {
     { &hf_dop_initiator,
       { "initiator", "dop.initiator",
         FT_UINT32, BASE_DEC, VALS(dop_T_initiator_vals), 0,
-        "T_initiator", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_symmetric,
       { "symmetric", "dop.symmetric",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_symmetric", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_roleA_replies,
       { "roleA-replies", "dop.roleA_replies",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_roleA_replies", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_roleB_replies,
       { "roleB-replies", "dop.roleB_replies",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_roleB_replies", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_performer,
       { "performer", "dop.performer",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2445,7 +2445,7 @@ void proto_register_dop(void) {
     { &hf_dop_signedModifyOperationalBindingArgument,
       { "signedModifyOperationalBindingArgument", "dop.signedModifyOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedModifyOperationalBindingArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_modifyOperationalBindingArgument,
       { "modifyOperationalBindingArgument", "dop.modifyOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2493,7 +2493,7 @@ void proto_register_dop(void) {
     { &hf_dop_signedTerminateOperationalBindingArgument,
       { "signedTerminateOperationalBindingArgument", "dop.signedTerminateOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedTerminateOperationalBindingArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_terminateOperationalBindingArgument,
       { "terminateOperationalBindingArgument", "dop.terminateOperationalBindingArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2513,11 +2513,11 @@ void proto_register_dop(void) {
     { &hf_dop_problem,
       { "problem", "dop.problem",
         FT_UINT32, BASE_DEC, VALS(dop_T_problem_vals), 0,
-        "T_problem", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_agreementProposal,
       { "agreementProposal", "dop.agreementProposal",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_agreementProposal", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_retryAt,
       { "retryAt", "dop.retryAt",
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
@@ -2601,11 +2601,11 @@ void proto_register_dop(void) {
     { &hf_dop_itemOrUserFirst,
       { "itemOrUserFirst", "dop.itemOrUserFirst",
         FT_UINT32, BASE_DEC, VALS(dop_T_itemOrUserFirst_vals), 0,
-        "T_itemOrUserFirst", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_itemFirst,
       { "itemFirst", "dop.itemFirst",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_itemFirst", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_protectedItems,
       { "protectedItems", "dop.protectedItems",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2621,7 +2621,7 @@ void proto_register_dop(void) {
     { &hf_dop_userFirst,
       { "userFirst", "dop.userFirst",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_userFirst", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_userClasses,
       { "userClasses", "dop.userClasses",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2637,11 +2637,11 @@ void proto_register_dop(void) {
     { &hf_dop_entry,
       { "entry", "dop.entry",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_allUserAttributeTypes,
       { "allUserAttributeTypes", "dop.allUserAttributeTypes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_attributeType,
       { "attributeType", "dop.attributeType",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2661,7 +2661,7 @@ void proto_register_dop(void) {
     { &hf_dop_allUserAttributeTypesAndValues,
       { "allUserAttributeTypesAndValues", "dop.allUserAttributeTypesAndValues",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_attributeValue,
       { "attributeValue", "dop.attributeValue",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2729,11 +2729,11 @@ void proto_register_dop(void) {
     { &hf_dop_allUsers,
       { "allUsers", "dop.allUsers",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_thisEntry,
       { "thisEntry", "dop.thisEntry",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_name,
       { "name", "dop.name",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2765,11 +2765,11 @@ void proto_register_dop(void) {
     { &hf_dop_basicLevels,
       { "basicLevels", "dop.basicLevels",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_basicLevels", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_level,
       { "level", "dop.level",
         FT_UINT32, BASE_DEC, VALS(dop_T_level_vals), 0,
-        "T_level", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_localQualifier,
       { "localQualifier", "dop.localQualifier",
         FT_INT32, BASE_DEC, NULL, 0,