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

diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 0ac40a5538..649f537366 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -652,223 +652,223 @@ proto_register_imf(void)
       	"imf.MailboxList", HFILL }},
     { &hf_imf_sender,
       { "Sender", "imf.sender", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_reply_to,
       { "Reply-To", "imf.reply_to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_to,
       { "To", "imf.to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_cc,
       { "Cc", "imf.cc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_bcc,
       { "Bcc", "imf.bcc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_message_id,
       { "Message-ID", "imf.message_id", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_in_reply_to,
       { "In-Reply-To", "imf.in_reply_to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_references,
       { "References", "imf.references", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_subject,
       { "Subject", "imf.subject", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_comments,
       { "Comments", "imf.comments", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_keywords,
       { "Keywords", "imf.keywords", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_date,
       { "Resent-Date", "imf.resent.date", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_from,
       { "Resent-From", "imf.resent.from", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_sender,
       { "Resent-Sender", "imf.resent.sender", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_to,
       { "Resent-To", "imf.resent.to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_cc,
       { "Resent-Cc", "imf.resent.cc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_bcc,
       { "Resent-Bcc", "imf.resent.bcc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_message_id,
       { "Resent-Message-ID", "imf.resent.message_id", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_return_path,
       { "Return-Path", "imf.return_path", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_received,
       { "Received", "imf.received", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_type,
       { "Content-Type", "imf.content.type", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_type_type,
       { "Type", "imf.content.type.type", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_type_parameters,
       { "Parameters", "imf.content.type.parameters", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_description,
       { "Content-Description", "imf.content.description", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_id,
       { "Content-ID", "imf.content.id", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_transfer_encoding,
       { "Content-Transfer-Encoding", "imf.content.transfer_encoding", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_mime_version,
       { "MIME-Version", "imf.mime_version", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_autoforwarded,
       { "Autoforwarded", "imf.autoforwarded", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_autosubmitted,
       { "Autosubmitted", "imf.autosubmitted", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_x400_content_identifier,
       { "X400-Content-Identifier", "imf.x400_content_identifier", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_content_language,
       { "Content-Language", "imf.content_language", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_conversion,
 	{ "Conversion", "imf.conversion", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_conversion_with_loss,
 	{ "Conversion-With-Loss", "imf.conversion_with_loss", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_delivery_date,
 	{ "Delivery-Date", "imf.delivery_date", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_discarded_x400_ipms_extensions,
 	{ "Discarded-X400-IPMS-Extensions", "imf.discarded_x400_ipms_extensions", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_discarded_x400_mts_extensions,
       { "Discarded-X400-MTS-Extensions", "imf.discarded_x400_mts_extensions", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_dl_expansion_history,
 	{ "DL-Expansion-History", "imf.dl_expansion_history", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_deferred_delivery,
 	{ "Deferred-Delivery", "imf.deferred_delivery", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_expires,
 	{ "Expires", "imf.expires", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_importance,
       { "Importance", "imf.importance", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_incomplete_copy,
 	{ "Incomplete-Copy", "imf.incomplete_copy", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_latest_delivery_time,
       { "Latest-Delivery-Time", "imf.latest_delivery_time", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_message_type,
 	{ "Message-Type", "imf.message_type", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_original_encoded_information_types,
 	{ "Original-Encoded-Information-Types", "imf.original_encoded_information_types", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_originator_return_address,
 	{ "Originator-Return-Address", "imf.originator_return_address", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_priority,
 	{ "Priority", "imf.priority", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_reply_by,
 	{ "Reply-By", "imf.reply_by", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_sensitivity,
 	{ "Sensitivity", "imf.sensitivity", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_supersedes,
 	{ "Supersedes", "imf.supersedes", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_x400_content_type,
 	{ "X400-Content-Type", "imf.x400_content_type", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_x400_mts_identifier,
 	{ "X400-MTS-Identifier", "imf.x400_mts_identifier", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_x400_originator,
 	{ "X400-Originator", "imf.x400_originator", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_x400_received,
 	{ "X400-Received", "imf.x400_received", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_x400_recipients,
 	{ "X400-Recipients", "imf.x400_recipients", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_delivered_to,
       { "Delivered-To", "imf.delivered_to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_mailer,
       { "X-Mailer", "imf.ext.mailer", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_mimeole,
       { "X-MimeOLE", "imf.ext.mimeole", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_expiry_date,
       { "Expiry-Date", "imf.ext.expiry-date", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_tnef_correlator,
       { "X-MS-TNEF-Correlator", "imf.ext.tnef-correlator", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_uidl,
       { "X-UIDL", "imf.ext.uidl", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_authentication_warning,
       { "X-Authentication-Warning", "imf.ext.authentication_warning", FT_STRING,  BASE_NONE,
-	NULL, 0x0, "", HFILL }},
+	NULL, 0x0, NULL, HFILL }},
     { &hf_imf_ext_virus_scanned,
       { "X-Virus-Scanned", "imf.ext.virus_scanned", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_thread_index,
       { "Thread-Index", "imf.thread-index", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_extension,
       { "Unknown-Extension", "imf.extension", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_extension_type,
       { "Type", "imf.extension.type", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_extension_value,
       { "Value", "imf.extension.value", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_display_name,
       { "Display-Name", "imf.display_name", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_address,
       { "Address", "imf.address", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_address_list,
       { "Address List", "imf.address_list", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_address_list_item,
       { "Item", "imf.address_list.item", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_mailbox_list,
       { "Mailbox List", "imf.mailbox_list", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_mailbox_list_item,
       { "Item", "imf.mailbox_list.item", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_message_text,
       { "Message-Text", "imf.message_text", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_imf,