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

diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 9c400cf285..570576e764 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -4390,7 +4390,7 @@ void proto_register_x420(void) {
         "x420.SensitivityField", HFILL }},
     { &hf_x420_AutoForwardedField_PDU,
       { "AutoForwardedField", "x420.AutoForwardedField",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.AutoForwardedField", HFILL }},
     { &hf_x420_Body_PDU,
       { "Body", "x420.Body",
@@ -4442,7 +4442,7 @@ void proto_register_x420(void) {
         "x420.EncryptedParameters", HFILL }},
     { &hf_x420_EncryptedData_PDU,
       { "EncryptedData", "x420.EncryptedData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.EncryptedData", HFILL }},
     { &hf_x420_MessageParameters_PDU,
       { "MessageParameters", "x420.MessageParameters",
@@ -4454,7 +4454,7 @@ void proto_register_x420(void) {
         "x420.MessageData", HFILL }},
     { &hf_x420_BilaterallyDefinedBodyPart_PDU,
       { "BilaterallyDefinedBodyPart", "x420.BilaterallyDefinedBodyPart",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BilaterallyDefinedBodyPart", HFILL }},
     { &hf_x420_IPN_PDU,
       { "IPN", "x420.IPN",
@@ -4578,7 +4578,7 @@ void proto_register_x420(void) {
         "x420.VoiceParameters", HFILL }},
     { &hf_x420_VoiceData_PDU,
       { "VoiceData", "x420.VoiceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.VoiceData", HFILL }},
     { &hf_x420_ForwardedContentParameters_PDU,
       { "ForwardedContentParameters", "x420.ForwardedContentParameters",
@@ -4634,7 +4634,7 @@ void proto_register_x420(void) {
         "x420.RecipientCategory", HFILL }},
     { &hf_x420_RecipientSecurityRequest_PDU,
       { "RecipientSecurityRequest", "x420.RecipientSecurityRequest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.RecipientSecurityRequest", HFILL }},
     { &hf_x420_IpnSecurityResponse_PDU,
       { "IpnSecurityResponse", "x420.IpnSecurityResponse",
@@ -4734,7 +4734,7 @@ void proto_register_x420(void) {
         "x420.SensitivityField", HFILL }},
     { &hf_x420_auto_forwarded,
       { "auto-forwarded", "x420.auto_forwarded",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.AutoForwardedField", HFILL }},
     { &hf_x420_extensions,
       { "extensions", "x420.extensions",
@@ -4754,11 +4754,11 @@ void proto_register_x420(void) {
         "x420.ORDescriptor", HFILL }},
     { &hf_x420_notification_requests,
       { "notification-requests", "x420.notification_requests",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.NotificationRequests", HFILL }},
     { &hf_x420_reply_requested,
       { "reply-requested", "x420.reply_requested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.BOOLEAN", HFILL }},
     { &hf_x420_recipient_extensions,
       { "recipient-extensions", "x420.recipient_extensions",
@@ -4854,7 +4854,7 @@ void proto_register_x420(void) {
         "x420.MixedModeBodyPart", HFILL }},
     { &hf_x420_bilaterally_defined,
       { "bilaterally-defined", "x420.bilaterally_defined",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BilaterallyDefinedBodyPart", HFILL }},
     { &hf_x420_nationally_defined,
       { "nationally-defined", "x420.nationally_defined",
@@ -4898,11 +4898,11 @@ void proto_register_x420(void) {
         "x420.INTEGER", HFILL }},
     { &hf_x420_g3facsimile_non_basic_parameters,
       { "non-basic-parameters", "x420.non_basic_parameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.G3FacsimileNonBasicParameters", HFILL }},
     { &hf_x420_G3FacsimileData_item,
       { "G3FacsimileData item", "x420.G3FacsimileData_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BIT_STRING", HFILL }},
     { &hf_x420_G4Class1BodyPart_item,
       { "Interchange-Data-Element", "x420.Interchange_Data_Element",
@@ -4922,7 +4922,7 @@ void proto_register_x420(void) {
         "x420.TeletexData", HFILL }},
     { &hf_x420_telex_compatible,
       { "telex-compatible", "x420.telex_compatible",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.BOOLEAN", HFILL }},
     { &hf_x420_teletex_non_basic_parameters,
       { "non-basic-parameters", "x420.non_basic_parameters",
@@ -4950,7 +4950,7 @@ void proto_register_x420(void) {
         "x420.EncryptedParameters", HFILL }},
     { &hf_x420_encrypted_data,
       { "data", "x420.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.EncryptedData", HFILL }},
     { &hf_x420_algorithm_identifier,
       { "algorithm-identifier", "x420.algorithm_identifier",
@@ -5118,7 +5118,7 @@ void proto_register_x420(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x420_encrypted,
       { "encrypted", "x420.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BIT_STRING", HFILL }},
     { &hf_x420_content_security_label,
       { "content-security-label", "x420.content_security_label",
@@ -5270,7 +5270,7 @@ void proto_register_x420(void) {
         "x420.GraphicString", HFILL }},
     { &hf_x420_application_cross_reference,
       { "application-cross-reference", "x420.application_cross_reference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.OCTET_STRING", HFILL }},
     { &hf_x420_message_reference,
       { "message-reference", "x420.message_reference",
@@ -5358,7 +5358,7 @@ void proto_register_x420(void) {
         "x420.T_compression_algorithm_param", HFILL }},
     { &hf_x420_permitted_actions,
       { "permitted-actions", "x420.permitted_actions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Permitted_Actions_Attribute", HFILL }},
     { &hf_x420_storage_account,
       { "storage-account", "x420.storage_account",
@@ -5454,7 +5454,7 @@ void proto_register_x420(void) {
         "x420.Access_Control_Element", HFILL }},
     { &hf_x420_action_list,
       { "action-list", "x420.action_list",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.Access_Request", HFILL }},
     { &hf_x420_concurrency_access,
       { "concurrency-access", "x420.concurrency_access",
@@ -5518,7 +5518,7 @@ void proto_register_x420(void) {
         "x420.GraphicString", HFILL }},
     { &hf_x420_octet_string,
       { "octet-string", "x420.octet_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.OCTET_STRING", HFILL }},
     { &hf_x420_Pass_Passwords_item,
       { "Password", "x420.Password",
@@ -5598,7 +5598,7 @@ void proto_register_x420(void) {
         "x420.INTEGER", HFILL }},
     { &hf_x420_processed,
       { "processed", "x420.processed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.BOOLEAN", HFILL }},
     { &hf_x420_data,
       { "data", "x420.data",
@@ -5670,7 +5670,7 @@ void proto_register_x420(void) {
         "x420.T_content_or_arguments", HFILL }},
     { &hf_x420_original_content,
       { "original-content", "x420.original_content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.OriginalContent", HFILL }},
     { &hf_x420_original_security_arguments,
       { "original-security-arguments", "x420.original_security_arguments",
@@ -5714,7 +5714,7 @@ void proto_register_x420(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x420_encrypted_key,
       { "encrypted-key", "x420.encrypted_key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BIT_STRING", HFILL }},
     { &hf_x420_recipient_certificate_selector,
       { "recipient-certificate-selector", "x420.recipient_certificate_selector",
@@ -5759,71 +5759,71 @@ void proto_register_x420(void) {
     { &hf_x420_NotificationRequests_rn,
       { "rn", "x420.rn",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_nrn,
       { "nrn", "x420.nrn",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_ipm_return,
       { "ipm-return", "x420.ipm-return",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_an_supported,
       { "an-supported", "x420.an-supported",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_suppress_an,
       { "suppress-an", "x420.suppress-an",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_read,
       { "read", "x420.read",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_insert,
       { "insert", "x420.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_replace,
       { "replace", "x420.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_extend,
       { "extend", "x420.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_erase,
       { "erase", "x420.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_read_attribute,
       { "read-attribute", "x420.read-attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_change_attribute,
       { "change-attribute", "x420.change-attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_delete_object,
       { "delete-object", "x420.delete-object",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_content_non_repudiation,
       { "content-non-repudiation", "x420.content-non-repudiation",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_content_proof,
       { "content-proof", "x420.content-proof",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_ipn_non_repudiation,
       { "ipn-non-repudiation", "x420.ipn-non-repudiation",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_ipn_proof,
       { "ipn-proof", "x420.ipn-proof",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x420-hfarr.c ---*/
 #line 129 "packet-x420-template.c"