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

diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 67d2b70331..5cf8c851f7 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -409,71 +409,71 @@ proto_register_enttec(void)
 		{ &hf_enttec_head,
 			{ "Head", "enttec.head",
 			  FT_UINT32, BASE_HEX, VALS(enttec_head_vals), 0x0,
-			  "Head", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_mac,
 			{ "MAC", "enttec.poll_reply.mac",
 			  FT_ETHER, BASE_HEX, NULL, 0x0,
-			  "MAC", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_node_type,
 			{ "Node Type", "enttec.poll_reply.node_type",
 			  FT_UINT16, BASE_HEX, NULL, 0x0,
-			  "Node Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_version,
 			{ "Version", "enttec.poll_reply.version",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Version", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_switch,
 			{ "Switch settings", "enttec.poll_reply.switch_settings",
 			  FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "Switch settings", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_name,
 			{ "Name", "enttec.poll_reply.name",
-			  FT_STRING, BASE_DEC, NULL, 0x0,
-			  "Name", HFILL } },
+			  FT_STRING, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_option,
 			{ "Option Field", "enttec.poll_reply.option_field",
 			  FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "Option Field", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_tos,
 			{ "TOS", "enttec.poll_reply.tos",
 			  FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "TOS", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_ttl,
 			{ "TTL", "enttec.poll_reply.ttl",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "TTL", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_universe,
 			{ "Universe", "enttec.dmx_data.universe",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Universe", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_start_code,
 			{ "Start Code", "enttec.dmx_data.start_code",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Start Code", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_type,
 			{ "Data Type", "enttec.dmx_data.type",
 			  FT_UINT8, BASE_HEX, VALS(enttec_data_type_vals), 0x0,
-			  "Data Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_size,
 			{ "Data Size", "enttec.dmx_data.size",
 			  FT_UINT16, BASE_DEC, NULL, 0x0,
-			  "Data Size", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_data,
 			{ "DMX Data", "enttec.dmx_data.data",
-			  FT_NONE, BASE_DEC, NULL, 0x0,
-			  "DMX Data", HFILL } },
+			  FT_NONE, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_data_filter,
 			{ "DMX Data", "enttec.dmx_data.data_filter",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "DMX Data", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_dmx_data,
 			{ "DMX Data", "enttec.dmx_data.dmx_data",
-			  FT_NONE, BASE_DEC, NULL, 0x0,
-			  "DMX Data", HFILL } },
+			  FT_NONE, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_type,
 			{ "Reply Type", "enttec.poll.reply_type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Reply Type", HFILL } }
+			  NULL, HFILL } }
 	};
 
 	static gint *ett[] = {