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

diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 3e7df69d12..9d284b82af 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -888,23 +888,23 @@ proto_register_ncp(void)
     { &hf_ncp_ip_sig,
       { "NCP over IP signature",	"ncp.ip.signature",
         FT_UINT32, BASE_HEX, VALS(ncp_ip_signature), 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_length,
       { "NCP over IP length",		"ncp.ip.length",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_ver,
       { "NCP over IP Version",		"ncp.ip.version",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_rplybufsize,
       { "NCP over IP Reply Buffer Size",	"ncp.ip.replybufsize",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_packetsig,
       { "NCP over IP Packet Signature",	"ncp.ip.packetsig",
         FT_BYTES, BASE_NONE, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_type,
       { "Type",			"ncp.type",
 	FT_UINT16, BASE_HEX, VALS(ncp_type_vals), 0x0,
@@ -912,23 +912,23 @@ proto_register_ncp(void)
     { &hf_ncp_seq,
       { "Sequence Number",     	"ncp.seq",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_connection,
       { "Connection Number",    "ncp.connection",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_task,
       { "Task Number",     	"ncp.task",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_oplock_flag,
       { "Broadcast Message Flag",    "ncp.msg_flag",
 	FT_UINT8, BASE_HEX, VALS(ncp_oplock_vals), 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_oplock_handle,
       { "File Handle",    "ncp.oplock_handle",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_stream_type,
       { "Stream Type",     	"ncp.stream_type",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
@@ -936,7 +936,7 @@ proto_register_ncp(void)
     { &hf_ncp_system_flags,
       { "System Flags",     	"ncp.system_flags",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_system_flags_abt,
       { "ABT",     	"ncp.system_flags.abt",
 	FT_BOOLEAN, 8, NULL, ABT,
@@ -1012,27 +1012,27 @@ proto_register_ncp(void)
     { &hf_ncp_completion_code,
       { "Completion Code",    "ncp.completion_code",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_connection_status,
       { "Connection Status",    "ncp.connection_status",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_slot,
       { "Slot",    "ncp.slot",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_control_code,
       { "Control Code",    "ncp.control_code",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_fragment_handle,
       { "Fragment Handle",    "ncp.fragger_hndl",
     FT_UINT16, BASE_HEX, NULL, 0x0,
-    "", HFILL }},
+    NULL, HFILL }},
     { &hf_lip_echo,
       { "Large Internet Packet Echo",    "ncp.lip_echo",
     FT_STRING, BASE_NONE, NULL, 0x0,
-    "", HFILL }},
+    NULL, HFILL }},
     { &hf_ncp_burst_command,
       { "Burst Command",    "ncp.burst_command",
 	FT_UINT32, BASE_HEX, VALS(burst_command), 0x0,
@@ -1043,7 +1043,7 @@ proto_register_ncp(void)
 	"Packet Burst File Handle", HFILL }},
  	{ &hf_ncp_burst_reserved,
 	{ "Reserved", "ncp.burst_reserved",
-    FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+    FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
   };
   static gint *ett[] = {