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

diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 184ab47f37..fab2edf7bf 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -4414,15 +4414,15 @@ void proto_register_p7(void) {
     { &hf_p7_registration_parameter,
       { "registration-parameter", "p7.registration_parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_registration_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_error_code,
       { "error-code", "p7.error_code",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_error_code", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_error_parameter,
       { "error-parameter", "p7.error_parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_error_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_MSExtensions_item,
       { "MSExtensionItem", "p7.MSExtensionItem",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4434,7 +4434,7 @@ void proto_register_p7(void) {
     { &hf_p7_initiator_name,
       { "initiator-name", "p7.initiator_name",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_initiator_name", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_initiator_credentials,
       { "initiator-credentials", "p7.initiator_credentials",
         FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
@@ -4522,7 +4522,7 @@ void proto_register_p7(void) {
     { &hf_p7_matching_rules_supported,
       { "matching-rules-supported", "p7.matching_rules_supported",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_matching_rules_supported", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_matching_rules_supported_item,
       { "matching-rules-supported item", "p7.matching_rules_supported_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -4542,7 +4542,7 @@ void proto_register_p7(void) {
     { &hf_p7_unsupported_extensions,
       { "unsupported-extensions", "p7.unsupported_extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_unsupported_extensions", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_unsupported_extensions_item,
       { "unsupported-extensions item", "p7.unsupported_extensions_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -4562,7 +4562,7 @@ void proto_register_p7(void) {
     { &hf_p7_indication_only,
       { "indication-only", "p7.indication_only",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_auto_action_log_entry,
       { "auto-action-log-entry", "p7.auto_action_log_entry",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -4574,7 +4574,7 @@ void proto_register_p7(void) {
     { &hf_p7_qualified_error,
       { "qualified-error", "p7.qualified_error",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_qualified_error", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_bind_problem,
       { "bind-problem", "p7.bind_problem",
         FT_UINT32, BASE_DEC, VALS(p7_BindProblem_vals), 0,
@@ -4586,7 +4586,7 @@ void proto_register_p7(void) {
     { &hf_p7_bind_extension_errors,
       { "bind-extension-errors", "p7.bind_extension_errors",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_bind_extension_errors", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_bind_extension_errors_item,
       { "bind-extension-errors item", "p7.bind_extension_errors_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -4646,7 +4646,7 @@ void proto_register_p7(void) {
     { &hf_p7_substrings,
       { "substrings", "p7.substrings",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_substrings", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_type,
       { "type", "p7.type",
         FT_OID, BASE_NONE, NULL, 0,
@@ -4654,23 +4654,23 @@ void proto_register_p7(void) {
     { &hf_p7_strings,
       { "strings", "p7.strings",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_strings", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_strings_item,
       { "strings item", "p7.strings_item",
         FT_UINT32, BASE_DEC, VALS(p7_T_strings_item_vals), 0,
-        "T_strings_item", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_initial,
       { "initial", "p7.initial",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_initial", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_any,
       { "any", "p7.any",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_any", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_final,
       { "final", "p7.final",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_final", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_greater_or_equal,
       { "greater-or-equal", "p7.greater_or_equal",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4698,11 +4698,11 @@ void proto_register_p7(void) {
     { &hf_p7_match_value,
       { "match-value", "p7.match_value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_match_value", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_attribute_value,
       { "attribute-value", "p7.attribute_value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_attribute_value", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_child_entries,
       { "child-entries", "p7.child_entries",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -4814,7 +4814,7 @@ void proto_register_p7(void) {
     { &hf_p7_count,
       { "count", "p7.count",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_count", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_span,
       { "span", "p7.span",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4882,7 +4882,7 @@ void proto_register_p7(void) {
     { &hf_p7_item,
       { "item", "p7.item",
         FT_UINT32, BASE_DEC, VALS(p7_T_item_vals), 0,
-        "T_item", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_search,
       { "search", "p7.search",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4914,7 +4914,7 @@ void proto_register_p7(void) {
     { &hf_p7_items,
       { "items", "p7.items",
         FT_UINT32, BASE_DEC, VALS(p7_T_items_vals), 0,
-        "T_items", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_sequence_numbers,
       { "sequence-numbers", "p7.sequence_numbers",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -4930,7 +4930,7 @@ void proto_register_p7(void) {
     { &hf_p7_delete_result_88,
       { "delete-result-88", "p7.delete_result_88",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_delete_result_94,
       { "delete-result-94", "p7.delete_result_94",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -4982,7 +4982,7 @@ void proto_register_p7(void) {
     { &hf_p7_change_credentials,
       { "change-credentials", "p7.change_credentials",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_change_credentials", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_register_old_credentials,
       { "old-credentials", "p7.old_credentials",
         FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
@@ -5050,7 +5050,7 @@ void proto_register_p7(void) {
     { &hf_p7_MessageGroupRegistrations_item,
       { "MessageGroupRegistrations item", "p7.MessageGroupRegistrations_item",
         FT_UINT32, BASE_DEC, VALS(p7_MessageGroupRegistrations_item_vals), 0,
-        "MessageGroupRegistrations_item", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_register_group,
       { "register-group", "p7.register_group",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5074,15 +5074,15 @@ void proto_register_p7(void) {
     { &hf_p7_registrations,
       { "registrations", "p7.registrations",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_registrations", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_extended_registrations,
       { "extended-registrations", "p7.extended_registrations",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_extended_registrations", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_extended_registrations_item,
       { "extended-registrations item", "p7.extended_registrations_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_extended_registrations_item", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_restrict_message_groups,
       { "restrict-message-groups", "p7.restrict_message_groups",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5114,11 +5114,11 @@ void proto_register_p7(void) {
     { &hf_p7_no_status_information,
       { "no-status-information", "p7.no_status_information",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_registered_information,
       { "registered-information", "p7.registered_information",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_registered_information", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_registered_list_attribute_defaults,
       { "list-attribute-defaults", "p7.list_attribute_defaults",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5158,7 +5158,7 @@ void proto_register_p7(void) {
     { &hf_p7_entries,
       { "entries", "p7.entries",
         FT_UINT32, BASE_DEC, VALS(p7_T_entries_vals), 0,
-        "T_entries", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_specific_entries,
       { "specific-entries", "p7.specific_entries",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5186,7 +5186,7 @@ void proto_register_p7(void) {
     { &hf_p7_modification,
       { "modification", "p7.modification",
         FT_UINT32, BASE_DEC, VALS(p7_T_modification_vals), 0,
-        "T_modification", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_add_attribute,
       { "add-attribute", "p7.add_attribute",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5246,7 +5246,7 @@ void proto_register_p7(void) {
     { &hf_p7_mts_result,
       { "mts-result", "p7.mts_result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_mts_result", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_message_submission_identifier,
       { "message-submission-identifier", "p7.message_submission_identifier",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5378,7 +5378,7 @@ void proto_register_p7(void) {
     { &hf_p7_restriction,
       { "restriction", "p7.restriction",
         FT_UINT32, BASE_DEC, VALS(p7_T_restriction_vals), 0,
-        "T_restriction", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_extended_content_type,
       { "content-type", "p7.content_type",
         FT_OID, BASE_NONE, NULL, 0,
@@ -5454,7 +5454,7 @@ void proto_register_p7(void) {
     { &hf_p7_no_correlated_reports,
       { "no-correlated-reports", "p7.no_correlated_reports",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_location,
       { "location", "p7.location",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5474,11 +5474,11 @@ void proto_register_p7(void) {
     { &hf_p7_submission_control_violated,
       { "submission-control-violated", "p7.submission_control_violated",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_originator_invalid,
       { "originator-invalid", "p7.originator_invalid",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_recipient_improperly_specified,
       { "recipient-improperly-specified", "p7.recipient_improperly_specified",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5486,11 +5486,11 @@ void proto_register_p7(void) {
     { &hf_p7_element_of_service_not_subscribed,
       { "element-of-service-not-subscribed", "p7.element_of_service_not_subscribed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_inconsistent_request,
       { "inconsistent-request", "p7.inconsistent_request",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_security_error,
       { "security-error", "p7.security_error",
         FT_UINT32, BASE_DEC, VALS(x411_SecurityProblem_vals), 0,
@@ -5498,11 +5498,11 @@ void proto_register_p7(void) {
     { &hf_p7_unsupported_critical_function,
       { "unsupported-critical-function", "p7.unsupported_critical_function",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_remote_bind_error,
       { "remote-bind-error", "p7.remote_bind_error",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_service_error,
       { "service-error", "p7.service_error",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5578,7 +5578,7 @@ void proto_register_p7(void) {
     { &hf_p7_userdataAB,
       { "userdataAB", "p7.userdataAB",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_userdataAB", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_content_types_restriction,
       { "override-content-types-restriction", "p7.override-content-types-restriction",
         FT_BOOLEAN, 8, NULL, 0x80,