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

diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index b654d855ba..7b00bc7e21 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -5091,7 +5091,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_processing_mode,
       { "processing-mode", "ftam.processing_mode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_processing_mode", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_open_contents_type,
       { "contents-type", "ftam.contents_type",
         FT_UINT32, BASE_DEC, VALS(ftam_T_open_contents_type_vals), 0,
@@ -5099,7 +5099,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_unknown,
       { "unknown", "ftam.unknown",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_proposed,
       { "proposed", "ftam.proposed",
         FT_UINT32, BASE_DEC, VALS(ftam_Contents_Type_Attribute_vals), 0,
@@ -5259,7 +5259,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_access_context,
       { "access-context", "ftam.access_context",
         FT_INT32, BASE_DEC, VALS(ftam_T_access_context_vals), 0,
-        "T_access_context", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_level_number,
       { "level-number", "ftam.level_number",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -5411,7 +5411,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_diagnostic_type,
       { "diagnostic-type", "ftam.diagnostic_type",
         FT_INT32, BASE_DEC, VALS(ftam_T_diagnostic_type_vals), 0,
-        "T_diagnostic_type", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_error_identifier,
       { "error-identifier", "ftam.error_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -5439,11 +5439,11 @@ void proto_register_ftam(void) {
     { &hf_ftam_relative,
       { "relative", "ftam.relative",
         FT_INT32, BASE_DEC, VALS(ftam_T_relative_vals), 0,
-        "T_relative", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_begin_end,
       { "begin-end", "ftam.begin_end",
         FT_INT32, BASE_DEC, VALS(ftam_T_begin_end_vals), 0,
-        "T_begin_end", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_single_name,
       { "single-name", "ftam.single_name",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5519,7 +5519,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_no_value_available,
       { "no-value-available", "ftam.no_value_available",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_actual_values3,
       { "actual-values", "ftam.actual_values",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5611,7 +5611,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_parameter,
       { "parameter", "ftam.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_constraint_set_and_abstract_Syntax,
       { "constraint-set-and-abstract-Syntax", "ftam.constraint_set_and_abstract_Syntax",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5647,7 +5647,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_abstract_Syntax_not_supported,
       { "abstract-Syntax-not-supported", "ftam.abstract_Syntax_not_supported",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_actual_values4,
       { "actual-values", "ftam.actual_values",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5879,15 +5879,15 @@ void proto_register_ftam(void) {
     { &hf_ftam_extension_attribute_identifier,
       { "extension-attribute-identifier", "ftam.extension_attribute_identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_extension_attribute_identifier", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_extension_attribute,
       { "extension-attribute", "ftam.extension_attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_extension_attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam__untag_item_03,
       { "_untag item", "ftam._untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T__untag_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_root_directory,
       { "root-directory", "ftam.root_directory",
         FT_UINT32, BASE_DEC, VALS(ftam_Pathname_Attribute_vals), 0,
@@ -5895,7 +5895,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_retrieval_scope,
       { "retrieval-scope", "ftam.retrieval_scope",
         FT_INT32, BASE_DEC, VALS(ftam_T_retrieval_scope_vals), 0,
-        "T_retrieval_scope", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_OR_Set_item,
       { "AND-Set", "ftam.AND_Set",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5903,7 +5903,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_AND_Set_item,
       { "AND-Set item", "ftam.AND_Set_item",
         FT_UINT32, BASE_DEC, VALS(ftam_AND_Set_item_vals), 0,
-        "AND_Set_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_pathname_Pattern,
       { "pathname-Pattern", "ftam.pathname_Pattern",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5995,11 +5995,11 @@ void proto_register_ftam(void) {
     { &hf_ftam_pathname_value,
       { "pathname-value", "ftam.pathname_value",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_pathname_value", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_pathname_value_item,
       { "pathname-value item", "ftam.pathname_value_item",
         FT_UINT32, BASE_DEC, VALS(ftam_T_pathname_value_item_vals), 0,
-        "T_pathname_value_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_string_match,
       { "string-match", "ftam.string_match",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -6007,15 +6007,15 @@ void proto_register_ftam(void) {
     { &hf_ftam_any_match,
       { "any-match", "ftam.any_match",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_string_value,
       { "string-value", "ftam.string_value",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_string_value", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_string_value_item,
       { "string-value item", "ftam.string_value_item",
         FT_UINT32, BASE_DEC, VALS(ftam_T_string_value_item_vals), 0,
-        "T_string_value_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_substring_match,
       { "substring-match", "ftam.substring_match",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -6075,7 +6075,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_Attribute_Extensions_Pattern_item,
       { "Attribute-Extensions-Pattern item", "ftam.Attribute_Extensions_Pattern_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Attribute_Extensions_Pattern_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_extension_set_attribute_Patterns,
       { "extension-set-attribute-Patterns", "ftam.extension_set_attribute_Patterns",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -6091,7 +6091,7 @@ void proto_register_ftam(void) {
     { &hf_ftam_extension_attribute_Pattern,
       { "extension-attribute-Pattern", "ftam.extension_attribute_Pattern",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_extension_attribute_Pattern", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam__untag_item_04,
       { "Read-Attributes", "ftam.Read_Attributes",
         FT_NONE, BASE_NONE, NULL, 0,