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

diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index f6ecbb56d6..be54613be2 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -4914,11 +4914,11 @@ void proto_register_x420(void) {
     { &hf_x420_type,
       { "type", "x420.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_type", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_value,
       { "value", "x420.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_value", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_this_IPM,
       { "this-IPM", "x420.this_IPM",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5066,7 +5066,7 @@ void proto_register_x420(void) {
     { &hf_x420_basic,
       { "basic", "x420.basic",
         FT_UINT32, BASE_DEC, VALS(x420_T_basic_vals), 0,
-        "T_basic", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ia5_text,
       { "ia5-text", "x420.ia5_text",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5334,7 +5334,7 @@ void proto_register_x420(void) {
     { &hf_x420_stored_body_part,
       { "stored-body-part", "x420.stored_body_part",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_stored_body_part", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_message_entry,
       { "message-entry", "x420.message_entry",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5350,7 +5350,7 @@ void proto_register_x420(void) {
     { &hf_x420_BodyPartSignatures_item,
       { "BodyPartSignatures item", "x420.BodyPartSignatures_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "BodyPartSignatures_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body_part_signature,
       { "body-part-signature", "x420.body_part_signature",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5386,7 +5386,7 @@ void proto_register_x420(void) {
     { &hf_x420_body_part_unlabelled,
       { "body-part-unlabelled", "x420.body_part_unlabelled",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body_part_security_label,
       { "body-part-security-label", "x420.body_part_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5406,7 +5406,7 @@ void proto_register_x420(void) {
     { &hf_x420_simple,
       { "simple", "x420.simple",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_timestamped,
       { "timestamped", "x420.timestamped",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -5490,7 +5490,7 @@ void proto_register_x420(void) {
     { &hf_x420_RelatedStoredFile_item,
       { "RelatedStoredFile item", "x420.RelatedStoredFile_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RelatedStoredFile_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_file_identifier,
       { "file-identifier", "x420.file_identifier",
         FT_UINT32, BASE_DEC, VALS(x420_FileIdentifier_vals), 0,
@@ -5550,7 +5550,7 @@ void proto_register_x420(void) {
     { &hf_x420_parameter,
       { "parameter", "x420.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_constraint_set_and_abstract_syntax,
       { "constraint-set-and-abstract-syntax", "x420.constraint_set_and_abstract_syntax",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5578,7 +5578,7 @@ void proto_register_x420(void) {
     { &hf_x420_user_visible_string,
       { "user-visible-string", "x420.user_visible_string",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_user_visible_string", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_user_visible_string_item,
       { "user-visible-string item", "x420.user_visible_string_item",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -5590,7 +5590,7 @@ void proto_register_x420(void) {
     { &hf_x420_descriptive_identifier,
       { "descriptive-identifier", "x420.descriptive_identifier",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_descriptive_identifier", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_descriptive_identifier_item,
       { "descriptive-identifier item", "x420.descriptive_identifier_item",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -5598,11 +5598,11 @@ void proto_register_x420(void) {
     { &hf_x420_compression_algorithm_id,
       { "compression-algorithm-id", "x420.compression_algorithm_id",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_compression_algorithm_id", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_compression_algorithm_param,
       { "compression-algorithm-param", "x420.compression_algorithm_param",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_compression_algorithm_param", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_permitted_actions,
       { "permitted-actions", "x420.permitted_actions",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -5682,7 +5682,7 @@ void proto_register_x420(void) {
     { &hf_x420_no_value_available,
       { "no-value-available", "x420.no_value_available",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_account_actual_values,
       { "actual-values", "x420.actual_values",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -5866,7 +5866,7 @@ void proto_register_x420(void) {
     { &hf_x420_BodyPartSignatureVerification_item,
       { "BodyPartSignatureVerification item", "x420.BodyPartSignatureVerification_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "BodyPartSignatureVerification_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body_part_sequence_number,
       { "body-part-sequence-number", "x420.body_part_sequence_number",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5886,11 +5886,11 @@ void proto_register_x420(void) {
     { &hf_x420_absent,
       { "absent", "x420.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_no_reply_received,
       { "no-reply-received", "x420.no_reply_received",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_received_replies,
       { "received-replies", "x420.received_replies",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5902,7 +5902,7 @@ void proto_register_x420(void) {
     { &hf_x420_no_ipn_received,
       { "no-ipn-received", "x420.no_ipn_received",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ipns_received,
       { "ipns-received", "x420.ipns_received",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5922,7 +5922,7 @@ void proto_register_x420(void) {
     { &hf_x420_original_security_arguments,
       { "original-security-arguments", "x420.original_security_arguments",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_original_security_arguments", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_original_content_integrity_check,
       { "original-content-integrity-check", "x420.original_content_integrity_check",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5942,7 +5942,7 @@ void proto_register_x420(void) {
     { &hf_x420_BodyPartTokens_item,
       { "BodyPartTokens item", "x420.BodyPartTokens_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "BodyPartTokens_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body_part_choice,
       { "body-part-choice", "x420.body_part_choice",
         FT_UINT32, BASE_DEC, VALS(x420_T_body_part_choice_vals), 0,
@@ -5974,7 +5974,7 @@ void proto_register_x420(void) {
     { &hf_x420_ForwardedContentToken_item,
       { "ForwardedContentToken item", "x420.ForwardedContentToken_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ForwardedContentToken_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body_part_token_choice,
       { "body-part-choice", "x420.body_part_choice",
         FT_UINT32, BASE_DEC, VALS(x420_T_body_part_token_choice_vals), 0,
@@ -5990,7 +5990,7 @@ void proto_register_x420(void) {
     { &hf_x420_choice,
       { "choice", "x420.choice",
         FT_UINT32, BASE_DEC, VALS(x420_T_choice_vals), 0,
-        "T_choice", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_non_receipt_fields,
       { "non-receipt-fields", "x420.non_receipt_fields",
         FT_NONE, BASE_NONE, NULL, 0,