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

diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index cf6255e0b9..2853f528c1 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -885,63 +885,63 @@ proto_register_dtpt(void)
     { &hf_dtpt_flags_deep,
       { "DEEP", "dtpt.flags.deep",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_DEEP,
-	"DEEP", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_containers,
       { "CONTAINERS", "dtpt.flags.containers",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_CONTAINERS,
-	"CONTAINERS", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_nocontainers,
       { "NOCONTAINERS", "dtpt.flags.nocontainers",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_NOCONTAINERS,
-	"NOCONTAINERS", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_nearest,
       { "NEAREST", "dtpt.flags.nearest",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_NEAREST,
-	"NEAREST", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_name,
       { "RETURN_NAME", "dtpt.flags.return_name",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_NAME,
-	"RETURN_NAME", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_type,
       { "RETURN_TYPE", "dtpt.flags.return_type",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_TYPE,
-	"RETURN_TYPE", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_version,
       { "RETURN_VERSION", "dtpt.flags.return_version",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_VERSION,
-	"RETURN_VERSION", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_comment,
       { "RETURN_COMMENT", "dtpt.flags.return_comment",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_COMMENT,
-	"RETURN_COMMENT", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_addr,
       { "RETURN_ADDR", "dtpt.flags.return_addr",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_ADDR,
-	"RETURN_ADDR", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_blob,
       { "RETURN_BLOB", "dtpt.flags.return_blob",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_BLOB,
-	"RETURN_BLOB", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_aliases,
       { "RETURN_ALIASES", "dtpt.flags.return_aliases",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_ALIASES,
-	"RETURN_ALIASES", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_query_string,
       { "RETURN_QUERY_STRING", "dtpt.flags.return_query_string",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_QUERY_STRING,
-	"RETURN_QUERY_STRING", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_flushcache,
       { "FLUSHCACHE", "dtpt.flags.flushcache",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_FLUSHCACHE,
-	"FLUSHCACHE", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_flushprevious,
       { "FLUSHPREVIOUS", "dtpt.flags.flushprevious",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_FLUSHPREVIOUS,
-	"FLUSHPREVIOUS", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_res_service,
       { "RES_SERVICE", "dtpt.flags.res_service",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RES_SERVICE,
-	"RES_SERVICE", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_payload_size,
       { "Payload Size", "dtpt.payload_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -953,15 +953,15 @@ proto_register_dtpt(void)
     { &hf_dtpt_error,
       { "Last Error", "dtpt.error",
 	FT_UINT32, BASE_DEC, VALS(names_error), 0x0,
-	"Last Error", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_buffer_size,
       { "Buffer Size", "dtpt.buffer_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Buffer Size", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_data_size,
       { "Data Size", "dtpt.data_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Data Size", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_queryset_rawsize,
       { "QuerySet Size", "dtpt.queryset_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -1045,31 +1045,31 @@ proto_register_dtpt(void)
     { &hf_dtpt_service_instance_name,
       { "Service Instance Name", "dtpt.service_instance_name",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Service Instance Name", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_service_class_id,
       { "Service Class ID", "dtpt.service_class_id",
 	FT_GUID, BASE_NONE, NULL, 0x0,
-	"Service Class ID", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_comment,
       { "Comment", "dtpt.comment",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Comment", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_ns_provider_id,
       { "NS Provider ID", "dtpt.ns_provider_id",
 	FT_GUID, BASE_NONE, NULL, 0x0,
-	"NS Provider ID", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_context,
       { "Context", "dtpt.context",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Context", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_protocols_number,
       { "Number of Protocols", "dtpt.protocols.number",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Number of Protocols", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_protocols_length,
       { "Length of Protocols", "dtpt.protocols.length",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Length of Protocols", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_protocol_family,
       { "Family", "dtpt.protocol.family",
 	FT_UINT32, BASE_DEC, VALS(names_family), 0x0,
@@ -1081,27 +1081,27 @@ proto_register_dtpt(void)
     { &hf_dtpt_query_string,
       { "Query String", "dtpt.query_string",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Query String", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addrs_number,
       { "Number of CS Addresses", "dtpt.cs_addrs.number",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Number of CS Addresses", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addrs_length1,
       { "Length of CS Addresses Part 1", "dtpt.cs_addrs.length1",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Length of CS Addresses Part 1", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_socket_type,
       { "Socket Type", "dtpt.cs_addrs.socket_type",
 	FT_UINT32, BASE_DEC, VALS(names_socket_type), 0x0,
-	"Socket Type", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_protocol,
       { "Protocol", "dtpt.cs_addrs.protocol",
 	FT_UINT32, BASE_DEC, VALS(names_protocol), 0x0,
-	"Protocol", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_local_pointer,
       { "Local Address Pointer", "dtpt.cs_addr.local_pointer",
 	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"Local Address Pointer", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_local_length,
       { "Local Address Length", "dtpt.cs_addr.local_length",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -1109,11 +1109,11 @@ proto_register_dtpt(void)
     { &hf_dtpt_cs_addr_local,
       { "Local Address", "dtpt.cs_addr.local",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Local Address", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_remote_pointer,
       { "Remote Address Pointer", "dtpt.cs_addr.remote_pointer",
 	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"Remote Address Pointer", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_remote_length,
       { "Remote Address Length", "dtpt.cs_addr.remote_length",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -1121,7 +1121,7 @@ proto_register_dtpt(void)
     { &hf_dtpt_cs_addr_remote,
       { "Remote Address", "dtpt.cs_addr.remote",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Remote Address", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_sockaddr_length,
       { "Length", "dtpt.sockaddr.length",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1156,7 +1156,7 @@ proto_register_dtpt(void)
 	"Length of the Blob Data Block", HFILL }},
     { &hf_dtpt_blob_data,
       { "Data", "dtpt.blob.data",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
 	"Blob Data Block", HFILL }},
     { &hf_dtpt_connect_addr,
       { "Address", "dtpt.blob.data",