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

diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 5486a43862..7e7932ed92 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -1131,7 +1131,7 @@ void proto_register_acp133(void) {
     { &hf_acp133_rIType,
       { "rIType", "acp133.rIType",
         FT_UINT32, BASE_DEC, VALS(acp133_T_rIType_vals), 0,
-        "T_rIType", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_minimize,
       { "minimize", "acp133.minimize",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -1167,7 +1167,7 @@ void proto_register_acp133(void) {
     { &hf_acp133_none,
       { "none", "acp133.none",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_insteadOf,
       { "insteadOf", "acp133.insteadOf",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -1211,23 +1211,23 @@ void proto_register_acp133(void) {
     { &hf_acp133_originating_MTA_report,
       { "originating-MTA-report", "acp133.originating_MTA_report",
         FT_INT32, BASE_DEC, VALS(acp133_T_originating_MTA_report_vals), 0,
-        "T_originating_MTA_report", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_originator_report,
       { "originator-report", "acp133.originator_report",
         FT_INT32, BASE_DEC, VALS(acp133_T_originator_report_vals), 0,
-        "T_originator_report", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_return_of_content,
       { "return-of-content", "acp133.return_of_content",
         FT_UINT32, BASE_DEC, VALS(acp133_T_return_of_content_vals), 0,
-        "T_return_of_content", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_priority,
       { "priority", "acp133.priority",
         FT_INT32, BASE_DEC, VALS(acp133_T_priority_vals), 0,
-        "T_priority", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_disclosure_of_other_recipients,
       { "disclosure-of-other-recipients", "acp133.disclosure_of_other_recipients",
         FT_UINT32, BASE_DEC, VALS(acp133_T_disclosure_of_other_recipients_vals), 0,
-        "T_disclosure_of_other_recipients", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_implicit_conversion_prohibited,
       { "implicit-conversion-prohibited", "acp133.implicit_conversion_prohibited",
         FT_UINT32, BASE_DEC, VALS(acp133_T_implicit_conversion_prohibited_vals), 0,
@@ -1235,7 +1235,7 @@ void proto_register_acp133(void) {
     { &hf_acp133_conversion_with_loss_prohibited,
       { "conversion-with-loss-prohibited", "acp133.conversion_with_loss_prohibited",
         FT_UINT32, BASE_DEC, VALS(acp133_T_conversion_with_loss_prohibited_vals), 0,
-        "T_conversion_with_loss_prohibited", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_further_dl_expansion_allowed,
       { "further-dl-expansion-allowed", "acp133.further_dl_expansion_allowed",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -1247,19 +1247,19 @@ void proto_register_acp133(void) {
     { &hf_acp133_proof_of_delivery,
       { "proof-of-delivery", "acp133.proof_of_delivery",
         FT_INT32, BASE_DEC, VALS(acp133_T_proof_of_delivery_vals), 0,
-        "T_proof_of_delivery", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_requested_delivery_method,
       { "requested-delivery-method", "acp133.requested_delivery_method",
         FT_UINT32, BASE_DEC, VALS(acp133_T_requested_delivery_method_vals), 0,
-        "T_requested_delivery_method", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_unchanged,
       { "unchanged", "acp133.unchanged",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_removed,
       { "removed", "acp133.removed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_replaced,
       { "replaced", "acp133.replaced",
         FT_UINT32, BASE_DEC, NULL, 0,