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

diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 7bcebdf0ab..fdb0ebfbd5 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -205,71 +205,71 @@ proto_register_dec_bpdu(void)
     { &hf_dec_bpdu_proto_id,
       { "Protocol Identifier",		"dec_stp.protocol",
 	FT_UINT8,	BASE_HEX,	VALS(&protocol_id_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_type,
       { "BPDU Type",			"dec_stp.type",
 	FT_UINT8,	BASE_DEC,	VALS(&bpdu_type_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_version_id,
       { "BPDU Version",			"dec_stp.version",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags,
       { "BPDU flags",			"dec_stp.flags",
 	FT_UINT8,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags_short_timers,
       { "Use short timers",		"dec_stp.flags.short_timers",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_SHORT_TIMERS,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags_tcack,
       { "Topology Change Acknowledgment",  "dec_stp.flags.tcack",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_TCACK,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags_tc,
       { "Topology Change",		"dec_stp.flags.tc",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_TC,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_root_pri,
       { "Root Priority",		"dec_stp.root.pri",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_root_mac,
       { "Root MAC",			"dec_stp.root.mac",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_root_cost,
       { "Root Path Cost",		"dec_stp.root.cost",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_bridge_pri,
       { "Bridge Priority",		"dec_stp.bridge.pri",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_bridge_mac,
       { "Bridge MAC",			"dec_stp.bridge.mac",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_port_id,
       { "Port identifier",		"dec_stp.port",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_msg_age,
       { "Message Age",			"dec_stp.msg_age",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_hello_time,
       { "Hello Time",			"dec_stp.hello",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_max_age,
       { "Max Age",			"dec_stp.max_age",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_forward_delay,
       { "Forward Delay",		"dec_stp.forward",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_dec_bpdu,