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

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 214f33b7d4..5187f85464 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1789,11 +1789,11 @@ void proto_register_acse(void) {
     { &hf_acse_encoding,
       { "encoding", "acse.encoding",
         FT_UINT32, BASE_DEC, VALS(acse_T_encoding_vals), 0,
-        "T_encoding", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_single_ASN1_type,
       { "single-ASN1-type", "acse.single_ASN1_type",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_single_ASN1_type", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_octet_aligned,
       { "octet-aligned", "acse.octet_aligned",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -2049,7 +2049,7 @@ void proto_register_acse(void) {
     { &hf_acse_ASOI_tag_item,
       { "ASOI-tag item", "acse.ASOI_tag_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ASOI_tag_item", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_qualifier,
       { "qualifier", "acse.qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
@@ -2073,7 +2073,7 @@ void proto_register_acse(void) {
     { &hf_acse_Context_list_item,
       { "Context-list item", "acse.Context_list_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Context_list_item", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_pci,
       { "pci", "acse.pci",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -2093,7 +2093,7 @@ void proto_register_acse(void) {
     { &hf_acse_Default_Context_List_item,
       { "Default-Context-List item", "acse.Default_Context_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Default_Context_List_item", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_abstract_syntax_name,
       { "abstract-syntax-name", "acse.abstract_syntax_name",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2105,7 +2105,7 @@ void proto_register_acse(void) {
     { &hf_acse_P_context_result_list_item,
       { "P-context-result-list item", "acse.P_context_result_list_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "P_context_result_list_item", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_pcontext_result,
       { "result", "acse.result",
         FT_INT32, BASE_DEC, VALS(acse_Result_vals), 0,
@@ -2117,15 +2117,15 @@ void proto_register_acse(void) {
     { &hf_acse_provider_reason,
       { "provider-reason", "acse.provider_reason",
         FT_INT32, BASE_DEC, VALS(acse_T_provider_reason_vals), 0,
-        "T_provider_reason", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_acse_service_user,
       { "acse-service-user", "acse.acse_service_user",
         FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_user_vals), 0,
-        "T_acse_service_user", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_acse_service_provider,
       { "acse-service-provider", "acse.acse_service_provider",
         FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0,
-        "T_acse_service_provider", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_Association_data_item,
       { "Association-data", "acse.EXTERNALt",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2145,11 +2145,11 @@ void proto_register_acse(void) {
     { &hf_acse_presentation_data_values,
       { "presentation-data-values", "acse.presentation_data_values",
         FT_UINT32, BASE_DEC, VALS(acse_T_presentation_data_values_vals), 0,
-        "T_presentation_data_values", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_simple_ASN1_type,
       { "simple-ASN1-type", "acse.simple_ASN1_type",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_simple_ASN1_type", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_pDVList_octet_aligned,
       { "octet-aligned", "acse.octet_aligned",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -2157,11 +2157,11 @@ void proto_register_acse(void) {
     { &hf_acse_other_mechanism_name,
       { "other-mechanism-name", "acse.other_mechanism_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_other_mechanism_name", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_other_mechanism_value,
       { "other-mechanism-value", "acse.other_mechanism_value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_other_mechanism_value", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_charstring,
       { "charstring", "acse.charstring",
         FT_STRING, BASE_NONE, NULL, 0,