From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770

1 files changed, 28 insertions, 28 deletions

diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 42a6408101..387d50a010 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -4427,7 +4427,7 @@ void proto_register_p7(void) {
         "p7.Restrictions", HFILL }},
     { &hf_p7_ms_configuration_request,
       { "ms-configuration-request", "p7.ms_configuration_request",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_ua_registration_identifier,
       { "ua-registration-identifier", "p7.ua_registration_identifier",
@@ -4479,7 +4479,7 @@ void proto_register_p7(void) {
         "p7.AttributeType", HFILL }},
     { &hf_p7_alert_indication,
       { "alert-indication", "p7.alert_indication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_content_types_supported,
       { "content-types-supported", "p7.content_types_supported",
@@ -4527,7 +4527,7 @@ void proto_register_p7(void) {
         "p7.OBJECT_IDENTIFIER", HFILL }},
     { &hf_p7_ua_registration_id_unknown,
       { "ua-registration-id-unknown", "p7.ua_registration_id_unknown",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_service_information,
       { "service-information", "p7.service_information",
@@ -4683,7 +4683,7 @@ void proto_register_p7(void) {
         "p7.T_attribute_value", HFILL }},
     { &hf_p7_child_entries,
       { "child-entries", "p7.child_entries",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_range,
       { "range", "p7.range",
@@ -4699,7 +4699,7 @@ void proto_register_p7(void) {
         "p7.INTEGER_1_ub_messages", HFILL }},
     { &hf_p7_override,
       { "override", "p7.override",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.OverrideRestrictions", HFILL }},
     { &hf_p7_EntryInformationSelection_item,
       { "AttributeSelection", "p7.AttributeSelection",
@@ -4743,7 +4743,7 @@ void proto_register_p7(void) {
         "p7.EntryClass", HFILL }},
     { &hf_p7_disable_auto_modify,
       { "disable-auto-modify", "p7.disable_auto_modify",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_add_message_group_names,
       { "add-message-group-names", "p7.add_message_group_names",
@@ -5051,7 +5051,7 @@ void proto_register_p7(void) {
         "p7.GeneralString_SIZE_1_ub_group_descriptor_length", HFILL }},
     { &hf_p7_registrations,
       { "registrations", "p7.registrations",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.T_registrations", HFILL }},
     { &hf_p7_extended_registrations,
       { "extended-registrations", "p7.extended_registrations",
@@ -5071,11 +5071,11 @@ void proto_register_p7(void) {
         "p7.MessageGroupName", HFILL }},
     { &hf_p7_immediate_descendants_only,
       { "immediate-descendants-only", "p7.immediate_descendants_only",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_omit_descriptors,
       { "omit-descriptors", "p7.omit_descriptors",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_algorithm_identifier,
       { "algorithm-identifier", "p7.algorithm_identifier",
@@ -5087,7 +5087,7 @@ void proto_register_p7(void) {
         "x411.InitiatorCredentials", HFILL }},
     { &hf_p7_password_delta,
       { "password-delta", "p7.password_delta",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.BIT_STRING", HFILL }},
     { &hf_p7_no_status_information,
       { "no-status-information", "p7.no_status_information",
@@ -5159,7 +5159,7 @@ void proto_register_p7(void) {
         "p7.MSExtensions", HFILL }},
     { &hf_p7_strict,
       { "strict", "p7.strict",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_modification,
       { "modification", "p7.modification",
@@ -5215,7 +5215,7 @@ void proto_register_p7(void) {
         "x411.MessageSubmissionEnvelope", HFILL }},
     { &hf_p7_content,
       { "content", "p7.content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Content", HFILL }},
     { &hf_p7_submission_options,
       { "submission-options", "p7.submission_options",
@@ -5271,7 +5271,7 @@ void proto_register_p7(void) {
         "x411.ContentLength", HFILL }},
     { &hf_p7_per_message_indicators,
       { "per-message-indicators", "p7.per_message_indicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.PerMessageIndicators", HFILL }},
     { &hf_p7_per_recipient_fields,
       { "per-recipient-fields", "p7.per_recipient_fields",
@@ -5427,7 +5427,7 @@ void proto_register_p7(void) {
         "p7.ModifyProblem", HFILL }},
     { &hf_p7_entry_class_problem,
       { "problem", "p7.problem",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.T_entry_class_problem", HFILL }},
     { &hf_p7_no_correlated_reports,
       { "no-correlated-reports", "p7.no_correlated_reports",
@@ -5539,7 +5539,7 @@ void proto_register_p7(void) {
         "p7.RTTPapdu", HFILL }},
     { &hf_p7_rttr_apdu,
       { "rttr-apdu", "p7.rttr_apdu",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.RTTRapdu", HFILL }},
     { &hf_p7_rtab_apdu,
       { "rtab-apdu", "p7.rtab_apdu",
@@ -5551,7 +5551,7 @@ void proto_register_p7(void) {
         "p7.AbortReason", HFILL }},
     { &hf_p7_reflectedParameter,
       { "reflectedParameter", "p7.reflectedParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.BIT_STRING", HFILL }},
     { &hf_p7_userdataAB,
       { "userdataAB", "p7.userdataAB",
@@ -5560,51 +5560,51 @@ void proto_register_p7(void) {
     { &hf_p7_OverrideRestrictions_override_content_types_restriction,
       { "override-content-types-restriction", "p7.override-content-types-restriction",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_EITs_restriction,
       { "override-EITs-restriction", "p7.override-EITs-restriction",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_attribute_length_restriction,
       { "override-attribute-length-restriction", "p7.override-attribute-length-restriction",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_auto_action_registrations,
       { "auto-action-registrations", "p7.auto-action-registrations",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_list_attribute_defaults,
       { "list-attribute-defaults", "p7.list-attribute-defaults",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_fetch_attribute_defaults,
       { "fetch-attribute-defaults", "p7.fetch-attribute-defaults",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_ua_registrations,
       { "ua-registrations", "p7.ua-registrations",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_submission_defaults,
       { "submission-defaults", "p7.submission-defaults",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_message_group_registrations,
       { "message-group-registrations", "p7.message-group-registrations",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_unsupported_entry_class,
       { "unsupported-entry-class", "p7.unsupported-entry-class",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_entry_class_not_subscribed,
       { "entry-class-not-subscribed", "p7.entry-class-not-subscribed",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_inappropriate_entry_class,
       { "inappropriate-entry-class", "p7.inappropriate-entry-class",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-p7-hfarr.c ---*/
 #line 95 "packet-p7-template.c"