From Kovarththanan Rajaratnam via bug 3548:

More header_field_info cleanup.

From me:
Don't fix the empty name for hf_nisplus_dummy.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28792 f5534014-38df-0310-8fa8-9805f1628bb7

10 files changed, 195 insertions, 195 deletions

diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 09bf56e868..1d643d8771 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -213,10 +213,10 @@ proto_register_chdlc(void)
   static hf_register_info hf[] = {
     { &hf_chdlc_addr,
       { "Address", "chdlc.address", FT_UINT8, BASE_HEX,
-        VALS(chdlc_address_vals), 0x0, "", HFILL }},
+        VALS(chdlc_address_vals), 0x0, NULL, HFILL }},
     { &hf_chdlc_proto,
       { "Protocol", "chdlc.protocol", FT_UINT16, BASE_HEX,
-        VALS(chdlc_vals), 0x0, "", HFILL }},
+        VALS(chdlc_vals), 0x0, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_chdlc,
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 7388d47716..52fd269a2b 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -2520,171 +2520,171 @@ proto_register_ip(void)
 
 		{ &hf_ip_version,
 		{ "Version",		"ip.version", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_hdr_len,
 		{ "Header Length",	"ip.hdr_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_dsfield,
 		{ "Differentiated Services field",	"ip.dsfield", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_dsfield_dscp,
 		{ "Differentiated Services Codepoint",	"ip.dsfield.dscp", FT_UINT8, BASE_HEX,
 			VALS(dscp_vals), IPDSFIELD_DSCP_MASK,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_dsfield_ect,
 		{ "ECN-Capable Transport (ECT)",	"ip.dsfield.ect", FT_UINT8, BASE_DEC, NULL,
 			IPDSFIELD_ECT_MASK,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_dsfield_ce,
 		{ "ECN-CE",	"ip.dsfield.ce", FT_UINT8, BASE_DEC, NULL,
 			IPDSFIELD_CE_MASK,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_tos,
 		{ "Type of Service",	"ip.tos", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_tos_precedence,
 		{ "Precedence",		"ip.tos.precedence", FT_UINT8, BASE_DEC, VALS(precedence_vals),
 			IPTOS_PREC_MASK,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_tos_delay,
 		{ "Delay",		"ip.tos.delay", FT_BOOLEAN, 8, TFS(&tos_set_low),
 			IPTOS_LOWDELAY,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_tos_throughput,
 		{ "Throughput",		"ip.tos.throughput", FT_BOOLEAN, 8, TFS(&tos_set_high),
 			IPTOS_THROUGHPUT,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_tos_reliability,
 		{ "Reliability",	"ip.tos.reliability", FT_BOOLEAN, 8, TFS(&tos_set_high),
 			IPTOS_RELIABILITY,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_tos_cost,
 		{ "Cost",		"ip.tos.cost", FT_BOOLEAN, 8, TFS(&tos_set_low),
 			IPTOS_LOWCOST,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_len,
 		{ "Total Length",	"ip.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_id,
 		{ "Identification",	"ip.id", FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_dst,
 		{ "Destination",	"ip.dst", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_dst_host,
 		{ "Destination Host",		"ip.dst_host", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_src,
 		{ "Source",		"ip.src", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_src_host,
 		{ "Source Host",		"ip.src_host", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_addr,
 		{ "Source or Destination Address", "ip.addr", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_host,
 		{ "Source or Destination Host", "ip.host", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 #ifdef HAVE_GEOIP
 		{ &hf_geoip_country,
 		{ "Source or Destination GeoIP Country", "ip.geoip.country", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_city,
 		{ "Source or Destination GeoIP City", "ip.geoip.city", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_org,
 		{ "Source or Destination GeoIP Organization", "ip.geoip.org", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_isp,
 		{ "Source or Destination GeoIP ISP", "ip.geoip.isp", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_asnum,
 		{ "Source or Destination GeoIP AS Number", "ip.geoip.asnum", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_lat,
 		{ "Source or Destination GeoIP Latitude", "ip.geoip.lat", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_lon,
 		{ "Source or Destination GeoIP Longitude", "ip.geoip.lon", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_country,
 		{ "Source GeoIP Country", "ip.geoip.src_country", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_city,
 		{ "Source GeoIP City", "ip.geoip.src_city", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_org,
 		{ "Source GeoIP Organization", "ip.geoip.src_org", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_isp,
 		{ "Source GeoIP ISP", "ip.geoip.src_isp", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_asnum,
 		{ "Source GeoIP AS Number", "ip.geoip.src_asnum", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_lat,
 		{ "Source GeoIP Latitude", "ip.geoip.src_lat", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_src_lon,
 		{ "Source GeoIP Longitude", "ip.geoip.src_lon", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_country,
 		{ "Destination GeoIP Country", "ip.geoip.dst_country", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_city,
 		{ "Destination GeoIP City", "ip.geoip.dst_city", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_org,
 		{ "Destination GeoIP Organization", "ip.geoip.dst_org", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_isp,
 		{ "Destination GeoIP ISP", "ip.geoip.dst_isp", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_asnum,
 		{ "Destination GeoIP AS Number", "ip.geoip.dst_asnum", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_lat,
 		{ "Destination GeoIP Latitude", "ip.geoip.dst_lat", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_geoip_dst_lon,
 		{ "Destination GeoIP Longitude", "ip.geoip.dst_lon", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 #endif /* HAVE_GEOIP */
 		{ &hf_ip_flags,
 		{ "Flags",		"ip.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_flags_rf,
 		{ "Reserved bit",	"ip.flags.rb", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_RF >> 12,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_flags_df,
 		{ "Don't fragment",	"ip.flags.df", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_DF >> 12,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_flags_mf,
 		{ "More fragments",	"ip.flags.mf", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_MF >> 12,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_frag_offset,
 		{ "Fragment offset",	"ip.frag_offset", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -2692,22 +2692,22 @@ proto_register_ip(void)
 
 		{ &hf_ip_ttl,
 		{ "Time to live",	"ip.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_proto,
 		{ "Protocol",		"ip.proto", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_checksum,
 		{ "Header checksum",	"ip.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_checksum_good,
 		{ "Good",	"ip.checksum_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"True: checksum matches packet content; False: doesn't match content or not checked", HFILL }},
 
 		{ &hf_ip_checksum_bad,
-		{ "Bad ",	"ip.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+		{ "Bad",	"ip.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"True: checksum doesn't match packet content; False: matches content or not checked", HFILL }},
 
 		{ &hf_ip_fragment_overlap,
@@ -2732,11 +2732,11 @@ proto_register_ip(void)
 
 		{ &hf_ip_fragment,
 		{ "IP Fragment", "ip.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"IP Fragment", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_fragments,
 		{ "IP Fragments", "ip.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-			"IP Fragments", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ip_reassembled_in,
 		{ "Reassembled IP in frame", "ip.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 4cec28fe91..50d77c0d5d 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -1338,29 +1338,29 @@ proto_register_nis(void)
 	static hf_register_info hf[] = {
 		{ &hf_nisplus_procedure_v3, {
 			"V3 Procedure", "nisplus.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(nisplus3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(nisplus3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nisplus_object, {
 			"NIS Object", "nisplus.object", FT_NONE, BASE_NONE,
-			NULL, 0, "NIS Object", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nisplus_oid, {
 			"Object Identity Verifier", "nisplus.object.oid", FT_NONE, BASE_NONE,
 			NULL, 0, "NIS Object Identity Verifier", HFILL }},
 
 		{ &hf_nisplus_object_name, {
-			"name", "nisplus.object.name", FT_STRING, BASE_DEC,
+			"name", "nisplus.object.name", FT_STRING, BASE_NONE,
 			NULL, 0, "NIS Name For This Object", HFILL }},
 
 		{ &hf_nisplus_object_owner, {
-			"owner", "nisplus.object.owner", FT_STRING, BASE_DEC,
+			"owner", "nisplus.object.owner", FT_STRING, BASE_NONE,
 			NULL, 0, "NIS Name Of Object Owner", HFILL }},
 
 		{ &hf_nisplus_object_group, {
-			"group", "nisplus.object.group", FT_STRING, BASE_DEC,
+			"group", "nisplus.object.group", FT_STRING, BASE_NONE,
 			NULL, 0, "NIS Name Of Access Group", HFILL }},
 
 		{ &hf_nisplus_object_domain, {
-			"domain", "nisplus.object.domain", FT_STRING, BASE_DEC,
+			"domain", "nisplus.object.domain", FT_STRING, BASE_NONE,
 			NULL, 0, "NIS Administrator For This Object", HFILL }},
 
 		{ &hf_nisplus_object_ttl, {
@@ -1368,7 +1368,7 @@ proto_register_nis(void)
 			NULL, 0, "NIS Time To Live For This Object", HFILL }},
 
 		{ &hf_nisplus_object_private, {
-			"private", "nisplus.object.private", FT_BYTES, BASE_DEC,
+			"private", "nisplus.object.private", FT_BYTES, BASE_NONE,
 			NULL, 0, "NIS Private Object", HFILL }},
 
 		{ &hf_nisplus_directory, {
@@ -1376,7 +1376,7 @@ proto_register_nis(void)
 			NULL, 0, "NIS Directory Object", HFILL }},
 
 		{ &hf_nisplus_directory_name, {
-			"directory name", "nisplus.directory.name", FT_STRING, BASE_DEC,
+			"directory name", "nisplus.directory.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Name Of Directory Being Served", HFILL }},
 
 		{ &hf_nisplus_directory_type, {
@@ -1496,7 +1496,7 @@ proto_register_nis(void)
 			NULL, 0, "NIS Server For This Directory", HFILL }},
 
 		{ &hf_nisplus_server_name, {
-			"name", "nisplus.server.name", FT_STRING, BASE_DEC,
+			"name", "nisplus.server.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Name Of NIS Server", HFILL }},
 
 		{ &hf_nisplus_key_type, {
@@ -1504,7 +1504,7 @@ proto_register_nis(void)
 			VALS(key_type), 0, "Type Of Key", HFILL }},
 
 		{ &hf_nisplus_key_data, {
-			"key data", "nisplus.key.data", FT_BYTES, BASE_DEC,
+			"key data", "nisplus.key.data", FT_BYTES, BASE_NONE,
 			NULL, 0, "Encryption Key", HFILL }},
 
 		{ &hf_nisplus_endpoints, {
@@ -1516,15 +1516,15 @@ proto_register_nis(void)
 			NULL, 0, "Endpoint For This NIS Server", HFILL }},
 
 		{ &hf_nisplus_endpoint_uaddr, {
-			"addr", "nisplus.endpoint.uaddr", FT_STRING, BASE_DEC,
+			"addr", "nisplus.endpoint.uaddr", FT_STRING, BASE_NONE,
 			NULL, 0, "Address", HFILL }},
 
 		{ &hf_nisplus_endpoint_family, {
-			"family", "nisplus.endpoint.family", FT_STRING, BASE_DEC,
+			"family", "nisplus.endpoint.family", FT_STRING, BASE_NONE,
 			NULL, 0, "Transport Family", HFILL }},
 
 		{ &hf_nisplus_endpoint_proto, {
-			"proto", "nisplus.endpoint.proto", FT_STRING, BASE_DEC,
+			"proto", "nisplus.endpoint.proto", FT_STRING, BASE_NONE,
 			NULL, 0, "Protocol", HFILL }},
 
 		{ &hf_nisplus_link, {
@@ -1537,14 +1537,14 @@ proto_register_nis(void)
 
 		{ &hf_nisplus_attr, {
 			"Attribute", "nisplus.attr", FT_NONE, BASE_NONE,
-			NULL, 0, "Attribute", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nisplus_attr_name, {
-			"name", "nisplus.attr.name", FT_STRING, BASE_DEC,
+			"name", "nisplus.attr.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Attribute Name", HFILL }},
 
 		{ &hf_nisplus_attr_val, {
-			"val", "nisplus.attr.val", FT_BYTES, BASE_HEX,
+			"val", "nisplus.attr.val", FT_BYTES, BASE_NONE,
 			NULL, 0, "Attribute Value", HFILL }},
 
 		{ &hf_nisplus_entry, {
@@ -1552,7 +1552,7 @@ proto_register_nis(void)
 			NULL, 0, "Entry Object", HFILL }},
 
 		{ &hf_nisplus_entry_type, {
-			"type", "nisplus.entry.type", FT_STRING, BASE_DEC,
+			"type", "nisplus.entry.type", FT_STRING, BASE_NONE,
 			NULL, 0, "Entry Type", HFILL }},
 
 		{ &hf_nisplus_entry_cols, {
@@ -1568,7 +1568,7 @@ proto_register_nis(void)
 			NULL, 0, "Entry Col Flags", HFILL }},
 
 		{ &hf_nisplus_entry_val, {
-			"val", "nisplus.entry.val", FT_STRING, BASE_DEC,
+			"val", "nisplus.entry.val", FT_STRING, BASE_NONE,
 			NULL, 0, "Entry Value", HFILL }},
 
 		{ &hf_nisplus_entry_mask, {
@@ -1605,7 +1605,7 @@ proto_register_nis(void)
 			NULL, 0, "Table Object", HFILL }},
 
 		{ &hf_nisplus_table_type, {
-			"type", "nisplus.table.type", FT_STRING, BASE_DEC,
+			"type", "nisplus.table.type", FT_STRING, BASE_NONE,
 			NULL, 0, "Table Type", HFILL }},
 
 		{ &hf_nisplus_table_maxcol, {
@@ -1625,11 +1625,11 @@ proto_register_nis(void)
 			NULL, 0, "Table Column", HFILL }},
 
 		{ &hf_nisplus_table_path, {
-			"path", "nisplus.table.path", FT_STRING, BASE_DEC,
+			"path", "nisplus.table.path", FT_STRING, BASE_NONE,
 			NULL, 0, "Table Path", HFILL }},
 
 		{ &hf_nisplus_table_col_name, {
-			"column name", "nisplus.table.col.name", FT_STRING, BASE_DEC,
+			"column name", "nisplus.table.col.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Column Name", HFILL }},
 
 		{ &hf_nisplus_table_col_mask, {
@@ -1684,7 +1684,7 @@ proto_register_nis(void)
 			NULL, 0, "Group Object Flags", HFILL }},
 
 		{ &hf_nisplus_group_name, {
-			"group name", "nisplus.group.name", FT_STRING, BASE_DEC,
+			"group name", "nisplus.group.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Name Of Group Member", HFILL }},
 
 		{ &hf_nisplus_object_ctime, {
@@ -1704,15 +1704,15 @@ proto_register_nis(void)
 			NULL, 0, "Optional First/NextBufSize", HFILL }},
 
 		{ &hf_nisplus_cookie, {
-			"cookie", "nisplus.cookie", FT_BYTES, BASE_HEX,
+			"cookie", "nisplus.cookie", FT_BYTES, BASE_NONE,
 			NULL, 0, "Cookie", HFILL }},
 
 		{ &hf_nisplus_fd_dirname, {
-			"dirname", "nisplus.fd.dirname", FT_STRING, BASE_DEC,
+			"dirname", "nisplus.fd.dirname", FT_STRING, BASE_NONE,
 			NULL, 0, "Directory Name", HFILL }},
 
 		{ &hf_nisplus_fd_requester, {
-			"requester", "nisplus.fd.requester", FT_STRING, BASE_DEC,
+			"requester", "nisplus.fd.requester", FT_STRING, BASE_NONE,
 			NULL, 0, "Host Principal Name For Signature", HFILL }},
 
 		{ &hf_nisplus_taglist, {
@@ -1728,11 +1728,11 @@ proto_register_nis(void)
 			NULL, 0, "Type Of Statistics Tag", HFILL }},
 
 		{ &hf_nisplus_tag_val, {
-			"value", "nisplus.tag.value", FT_STRING, BASE_DEC,
+			"value", "nisplus.tag.value", FT_STRING, BASE_NONE,
 			NULL, 0, "Value Of Statistics Tag", HFILL }},
 
 		{ &hf_nisplus_dump_dir, {
-			"directory", "nisplus.dump.dir", FT_STRING, BASE_DEC,
+			"directory", "nisplus.dump.dir", FT_STRING, BASE_NONE,
 			NULL, 0, "Directory To Dump", HFILL }},
 
 		{ &hf_nisplus_dump_time, {
@@ -1741,14 +1741,14 @@ proto_register_nis(void)
 
 		{ &hf_nisplus_dummy, {
 			" ", "nisplus.dummy", FT_BYTES, BASE_NONE,
-			NULL, 0, " ", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nisplus_ping_time, {
 			"time", "nisplus.ping.time", FT_ABSOLUTE_TIME, BASE_NONE,
 			NULL, 0, "Timestamp Of The Transaction", HFILL }},
 
 		{ &hf_nisplus_ping_dir, {
-			"directory", "nisplus.ping.dir", FT_STRING, BASE_DEC,
+			"directory", "nisplus.ping.dir", FT_STRING, BASE_NONE,
 			NULL, 0, "Directory That Had The Change", HFILL }},
 
 		{ &hf_nisplus_error, {
@@ -1756,11 +1756,11 @@ proto_register_nis(void)
 			VALS(nis_error), 0, "NIS Status Code", HFILL }},
 
 		{ &hf_nisplus_dir_data, {
-			"data", "nisplus.fd.dir.data", FT_BYTES, BASE_HEX,
+			"data", "nisplus.fd.dir.data", FT_BYTES, BASE_NONE,
 			NULL, 0, "Directory Data In XDR Format", HFILL }},
 
 		{ &hf_nisplus_signature, {
-			"signature", "nisplus.fd.sig", FT_BYTES, BASE_HEX,
+			"signature", "nisplus.fd.sig", FT_BYTES, BASE_NONE,
 			NULL, 0, "Signature Of The Source", HFILL }},
 
 		{ &hf_nisplus_log_entries, {
@@ -1780,13 +1780,13 @@ proto_register_nis(void)
 			VALS(entry_type), 0, "Type Of Entry In Transaction Log", HFILL }},
 
 		{ &hf_nisplus_log_principal, {
-			"principal", "nisplus.log.principal", FT_STRING, BASE_DEC,
+			"principal", "nisplus.log.principal", FT_STRING, BASE_NONE,
 			NULL, 0, "Principal Making The Change", HFILL }},
 
 		{ &hf_nisplus_callback_status, {
 			"status", "nisplus.callback.status",
-			FT_BOOLEAN, 0, TFS(&tfs_callback_status),
-			0, "Status Of Callback Thread", HFILL }},
+			FT_BOOLEAN, BASE_NONE, TFS(&tfs_callback_status),
+			0x0, "Status Of Callback Thread", HFILL }},
 
 		{ &hf_nisplus_cp_status, {
 			"status", "nisplus.checkpoint.status", FT_UINT32, BASE_DEC,
@@ -1802,19 +1802,19 @@ proto_register_nis(void)
 
 		{ &hf_nisplus_zticks, {
 			"zticks", "nisplus.zticks", FT_UINT32, BASE_DEC,
-			NULL, 0, "", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nisplus_dticks, {
 			"dticks", "nisplus.dticks", FT_UINT32, BASE_DEC,
-			NULL, 0, "", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nisplus_aticks, {
 			"aticks", "nisplus.aticks", FT_UINT32, BASE_DEC,
-			NULL, 0, "", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nisplus_cticks, {
 			"cticks", "nisplus.cticks", FT_UINT32, BASE_DEC,
-			NULL, 0, "", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index edcb00a17b..f58a6587c4 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -239,7 +239,7 @@ proto_register_pflog(void)
         "Reason for logging the packet", HFILL }},
     { &hf_pflog_ifname,
       { "Interface", "pflog.ifname", FT_STRING, BASE_NONE, NULL, 0x0,
-        "Interface", HFILL }},
+        NULL, HFILL }},
     { &hf_pflog_ruleset,
       { "Ruleset", "pflog.ruleset", FT_STRING, BASE_NONE, NULL, 0x0,
         "Ruleset name in anchor", HFILL }},
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index eb04eb0984..3c537b5a7f 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -650,10 +650,10 @@ proto_register_pktc(void)
     static hf_register_info hf[] = {
 	{ &hf_pktc_kmmid, {
 	    "Key Management Message ID", "pktc.kmmid", FT_UINT8, BASE_HEX,
-	    VALS(kmmid_types), 0, "Key Management Message ID", HFILL }},
+	    VALS(kmmid_types), 0, NULL, HFILL }},
 	{ &hf_pktc_doi, {
 	    "Domain of Interpretation", "pktc.doi", FT_UINT8, BASE_DEC,
-	    VALS(doi_types), 0, "Domain of Interpretation", HFILL }},
+	    VALS(doi_types), 0, NULL, HFILL }},
 	{ &hf_pktc_version_major, {
 	    "Major version", "pktc.version.major", FT_UINT8, BASE_DEC,
 	    NULL, 0, "Major version of PKTC", HFILL }},
@@ -664,41 +664,41 @@ proto_register_pktc(void)
 	    "Server Nonce", "pktc.server_nonce", FT_UINT32, BASE_HEX,
 	    NULL, 0, "Server Nonce random number", HFILL }},
 	{ &hf_pktc_server_principal, {
-	    "Server Kerberos Principal Identifier", "pktc.server_principal", FT_STRING, BASE_DEC,
-	    NULL, 0, "Server Kerberos Principal Identifier", HFILL }},
+	    "Server Kerberos Principal Identifier", "pktc.server_principal", FT_STRING, BASE_NONE,
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_timestamp, {
 	    "Timestamp", "pktc.timestamp", FT_STRING, BASE_NONE,
 	    NULL, 0, "Timestamp (UTC)", HFILL }},
 	{ &hf_pktc_app_spec_data, {
-	    "Application Specific Data", "pktc.asd", FT_NONE, BASE_HEX,
+	    "Application Specific Data", "pktc.asd", FT_NONE, BASE_NONE,
 	    NULL, 0, "KMMID/DOI application specific data", HFILL }},
 	{ &hf_pktc_list_of_ciphersuites, {
-            "List of Ciphersuites", "pktc.ciphers", FT_NONE, BASE_HEX,
-	    NULL, 0, "List of Ciphersuites", HFILL }},
+            "List of Ciphersuites", "pktc.ciphers", FT_NONE, BASE_NONE,
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_list_of_ciphersuites_len, {
             "Number of Ciphersuites", "pktc.ciphers.len", FT_UINT8, BASE_DEC,
-	    NULL, 0, "Number of Ciphersuites", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_snmpAuthenticationAlgorithm, {
            "SNMPv3 Authentication Algorithm", "pktc.asd.snmp_auth_alg", FT_UINT8, BASE_HEX,
-           VALS(snmp_authentication_algorithm_vals), 0, "SNMPv3 Authentication Algorithm", HFILL }},
+           VALS(snmp_authentication_algorithm_vals), 0, NULL, HFILL }},
 	{ &hf_pktc_snmpEncryptionTransformID, {
            "SNMPv3 Encryption Transform ID", "pktc.asd.snmp_enc_alg", FT_UINT8, BASE_HEX,
-           VALS(snmp_transform_id_vals), 0, "SNMPv3 Encryption Transform ID", HFILL }},
+           VALS(snmp_transform_id_vals), 0, NULL, HFILL }},
 	{ &hf_pktc_ipsecAuthenticationAlgorithm, {
            "IPsec Authentication Algorithm", "pktc.asd.ipsec_auth_alg", FT_UINT8, BASE_HEX,
-           VALS(ipsec_authentication_algorithm_vals), 0, "IPsec Authentication Algorithm", HFILL }},
+           VALS(ipsec_authentication_algorithm_vals), 0, NULL, HFILL }},
 	{ &hf_pktc_ipsecEncryptionTransformID, {
            "IPsec Encryption Transform ID", "pktc.asd.ipsec_enc_alg", FT_UINT8, BASE_HEX,
-           VALS(ipsec_transform_id_vals), 0, "IPsec Encryption Transform ID", HFILL }},
+           VALS(ipsec_transform_id_vals), 0, NULL, HFILL }},
 	{ &hf_pktc_snmpEngineID_len, {
            "SNMPv3 Engine ID Length", "pktc.asd.snmp_engine_id.len", FT_UINT8, BASE_DEC,
            NULL, 0, "Length of SNMPv3 Engine ID", HFILL }},
 	{ &hf_pktc_snmpEngineID, {
-           "SNMPv3 Engine ID", "pktc.asd.snmp_engine_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "SNMPv3 Engine ID", HFILL }},
+           "SNMPv3 Engine ID", "pktc.asd.snmp_engine_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_snmpEngineBoots, {
            "SNMPv3 Engine Boots", "pktc.asd.snmp_engine_boots", FT_UINT32, BASE_DEC,
-           NULL, 0, "SNMPv3 Engine Boots", HFILL }},
+           NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_snmpEngineTime, {
            "SNMPv3 Engine Time", "pktc.asd.snmp_engine_time", FT_UINT32, BASE_DEC,
            NULL, 0, "SNMPv3 Engine ID Time", HFILL }},
@@ -706,23 +706,23 @@ proto_register_pktc(void)
            "SNMPv3 USM User Name Length", "pktc.asd.snmp_usm_username.len", FT_UINT8, BASE_DEC,
            NULL, 0, "Length of SNMPv3 USM User Name", HFILL }},
 	{ &hf_pktc_usmUserName, {
-           "SNMPv3 USM User Name", "pktc.asd.snmp_usm_username", FT_STRING, BASE_DEC,
-           NULL, 0, "SNMPv3 USM User Name", HFILL }},
+           "SNMPv3 USM User Name", "pktc.asd.snmp_usm_username", FT_STRING, BASE_NONE,
+           NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_ipsec_spi, {
            "IPsec Security Parameter Index", "pktc.asd.ipsec_spi", FT_UINT32, BASE_HEX,
            NULL, 0, "Security Parameter Index for inbound Security Association (IPsec)", HFILL }},
 	{ &hf_pktc_reestablish_flag, {
 	    "Re-establish Flag", "pktc.reestablish", FT_BOOLEAN, BASE_NONE,
-	    NULL, 0, "Re-establish Flag", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
 	{ &hf_pktc_ack_required_flag, {
 	    "ACK Required Flag", "pktc.ack_required", FT_BOOLEAN, BASE_NONE,
-	    NULL, 0, "ACK Required Flag", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
 	{ &hf_pktc_sec_param_lifetime, {
 	    "Security Parameter Lifetime", "pktc.spl", FT_UINT32, BASE_DEC,
 	    NULL, 0, "Lifetime in seconds of security parameter", HFILL }},
         { &hf_pktc_sha1_hmac, {
-           "SHA-1 HMAC", "pktc.sha1_hmac", FT_BYTES, BASE_HEX,
-           NULL, 0, "SHA-1 HMAC", HFILL }},
+           "SHA-1 HMAC", "pktc.sha1_hmac", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL }},
 	{ &hf_pktc_grace_period, {
 	    "Grace Period", "pktc.grace_period", FT_UINT32, BASE_DEC,
 	    NULL, 0, "Grace Period in seconds", HFILL }},
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 65ea1ba428..76a704d108 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -4147,15 +4147,15 @@ proto_register_ppp(void)
 
     { &hf_ppp_address,
     { "Address", "ppp.address", FT_UINT8, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
 
     { &hf_ppp_control,
     { "Control", "ppp.control", FT_UINT8, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
 
     { &hf_ppp_protocol,
     { "Protocol", "ppp.protocol", FT_UINT16, BASE_HEX,
-        VALS(ppp_vals), 0x0, "", HFILL }},
+        VALS(ppp_vals), 0x0, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_ppp
@@ -4223,19 +4223,19 @@ proto_register_mp(void)
   static hf_register_info hf[] = {
     { &hf_mp_frag_first,
     { "First fragment",		"mp.first",	FT_BOOLEAN, 8,
-        TFS(&tfs_yes_no), MP_FRAG_FIRST, "", HFILL }},
+        TFS(&tfs_yes_no), MP_FRAG_FIRST, NULL, HFILL }},
 
     { &hf_mp_frag_last,
     { "Last fragment",		"mp.last",	FT_BOOLEAN, 8,
-        TFS(&tfs_yes_no), MP_FRAG_LAST, "", HFILL }},
+        TFS(&tfs_yes_no), MP_FRAG_LAST, NULL, HFILL }},
 
     { &hf_mp_sequence_num,
     { "Sequence number",	"mp.seq",	FT_UINT24, BASE_DEC, NULL, 0x0,
-    	"", HFILL }},
+    	NULL, HFILL }},
 
     { &hf_mp_short_sequence_num,
     { "Sequence number",	"mp.seq",	FT_UINT16, BASE_DEC, NULL, 0x0FFF,
-    	"", HFILL }}
+    	NULL, HFILL }}
   };
   static gint *ett[] = {
     &ett_mp,
@@ -4362,27 +4362,27 @@ proto_register_bcp(void)
   static hf_register_info hf[] = {
     { &hf_bcp_flags,
     { "Flags", "bcp.flags", FT_UINT8, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
 
     { &hf_bcp_fcs_present,
     { "LAN FCS present",	"bcp.flags.fcs_present",	FT_BOOLEAN, 8,
-        TFS(&tfs_yes_no), BCP_FCS_PRESENT, "", HFILL }},
+        TFS(&tfs_yes_no), BCP_FCS_PRESENT, NULL, HFILL }},
 
     { &hf_bcp_zeropad,
     { "802.3 pad zero-filled",	"bcp.flags.zeropad",	FT_BOOLEAN, 8,
-        TFS(&tfs_yes_no), BCP_ZEROPAD, "", HFILL }},
+        TFS(&tfs_yes_no), BCP_ZEROPAD, NULL, HFILL }},
 
     { &hf_bcp_bcontrol,
     { "Bridge control",	"bcp.flags.bcontrol",	FT_BOOLEAN, 8,
-        TFS(&tfs_yes_no), BCP_IS_BCONTROL, "", HFILL }},
+        TFS(&tfs_yes_no), BCP_IS_BCONTROL, NULL, HFILL }},
 
     { &hf_bcp_pads,
     { "Pads",	"bcp.pads",	FT_UINT8, BASE_DEC,
-        NULL, BCP_PADS_MASK, "", HFILL }},
+        NULL, BCP_PADS_MASK, NULL, HFILL }},
 
     { &hf_bcp_mac_type,
     { "MAC Type", "bcp.mac_type", FT_UINT8, BASE_DEC,
-        VALS(bcp_mac_type_vals), 0x0, "", HFILL }},
+        VALS(bcp_mac_type_vals), 0x0, NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 3d914eb90b..2b48293306 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -473,162 +473,162 @@ void proto_register_pppoed(void)
 		/* Discovery tag fields */
 		{ &hf_pppoed_tags,
 			{ "PPPoE Tags", "pppoed.tags", FT_NONE, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag,
 			{ "Tag", "pppoed.tag", FT_UINT16, BASE_HEX,
-				 VALS(tag_vals), 0x0, "", HFILL
+				 VALS(tag_vals), 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_length,
 			{ "Tag Length", "pppoed.tag_length", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_unknown_data,
 			{ "Unknown Data", "pppoed.tag.unknown_data", FT_BYTES, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_service_name,
 			{ "Service-Name", "pppoed.tags.service_name", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_ac_name,
 			{ "AC-Name", "pppoed.tags.ac_name", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_host_uniq,
 			{ "Host-Uniq", "pppoed.tags.host_uniq", FT_BYTES, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_ac_cookie,
 			{ "AC-Cookie", "pppoed.tags.ac_cookie", FT_BYTES, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_vendor_id,
 			{ "Vendor id", "pppoed.tags.vendor_id", FT_UINT32, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_vendor_unspecified,
-			{ "Vendor unspecified", "pppoed.tags.vendor_unspecified", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "Vendor unspecified", "pppoed.tags.vendor_unspecified", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_credits,
-			{ "Credits", "pppoed.tags.credits", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "Credits", "pppoed.tags.credits", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_credits_fcn,
 			{ "FCN", "pppoed.tags.credits.fcn", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_credits_bcn,
 			{ "BCN", "pppoed.tags.credits.bcn", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics,
-			{ "Metrics", "pppoed.tags.metrics", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "Metrics", "pppoed.tags.metrics", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics_r,
 			{ "Receive Only", "pppoed.tags.metrics.r", FT_BOOLEAN, 16,
-				 NULL, PPPOE_RCV_ONLY_MASK, "", HFILL
+				 NULL, PPPOE_RCV_ONLY_MASK, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_mdr_units,
 			{ "MDR Units", "pppoed.tags.metrics.mdr_units", FT_UINT16, BASE_HEX,
-				 VALS(datarate_scale_vals), PPPOE_MDR_MASK, "", HFILL
+				 VALS(datarate_scale_vals), PPPOE_MDR_MASK, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_cdr_units,
 			{ "CDR Units", "pppoed.tags.metrics.cdr_units", FT_UINT16, BASE_HEX,
-				 VALS(datarate_scale_vals), PPPOE_CDR_MASK, "", HFILL
+				 VALS(datarate_scale_vals), PPPOE_CDR_MASK, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics_rlq,
 			{ "Relative Link Quality", "pppoed.tags.metrics.rlq", FT_UINT8, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics_resource,
 			{ "Resource", "pppoed.tags.metrics.resource", FT_UINT8, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics_latency,
 			{ "Latency", "pppoed.tags.metrics.latency", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics_curr_drate,
 			{ "Curr. datarate", "pppoed.tags.metrics.curr_drate", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_metrics_max_drate,
 			{ "Max. datarate", "pppoed.tags.metrics.max_drate", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_seq_num,
 			{ "Sequence Number", "pppoed.tags.seq_num", FT_UINT16, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_cred_scale,
 			{ "Credit Scale Factor", "pppoed.tags.credit_scale", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_relay_session_id,
 			{ "Relay-Session-Id", "pppoed.tags.relay_session_id", FT_BYTES, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_hurl,
-			{ "HURL", "pppoed.tags.hurl", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "HURL", "pppoed.tags.hurl", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_motm,
-			{ "MOTM", "pppoed.tags.motm", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "MOTM", "pppoed.tags.motm", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_max_payload,
-			{ "PPP Max Palyload", "pppoed.tags.max_payload", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "PPP Max Palyload", "pppoed.tags.max_payload", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_ip_route_add,
-			{ "IP Route Add", "pppoed.tags.ip_route_add", FT_BYTES, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+			{ "IP Route Add", "pppoed.tags.ip_route_add", FT_BYTES, BASE_NONE,
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_service_name_error,
 			{ "Service-Name-Error", "pppoed.tags.service_name_error", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_ac_system_error,
 			{ "AC-System-Error", "pppoed.tags.ac_system_error", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoed_tag_generic_error,
 			{ "Generic-Error", "pppoed.tags.generic_error", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		}
 	};
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index b28f0809fa..a6661c1c7d 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -1017,7 +1017,7 @@ proto_register_rtmac(void) {
     { &hf_tdma_v1_msg_ack_ack_conf_padding,
       { "Padding",
         "tdma-v1.msg.ack_ack_conf.padding",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "TDMA Padding", HFILL }},
 
     /* TDMA request test */
@@ -1082,13 +1082,13 @@ proto_register_rtmac(void) {
     { &hf_tdma_v1_msg_station_list_ip,
       { "IP",
         "tdma-v1.msg.station_list.ip",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
+        FT_IPv4, BASE_NONE, NULL, 0x0,
         "TDMA Station IP", HFILL }},
 
     { &hf_tdma_v1_msg_station_list_padding,
       { "Padding",
         "tdma-v1.msg.station_list.padding",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "TDMA Padding", HFILL }},
 
 
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index e30c793a28..825e9b661a 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -3216,11 +3216,11 @@ proto_register_pipe_lanman(void)
 			NULL, 0, "LANMAN Code Page", HFILL }},
 
 		{ &hf_new_password,
-			{ "New Password", "lanman.new_password", FT_BYTES, BASE_HEX,
+			{ "New Password", "lanman.new_password", FT_BYTES, BASE_NONE,
 			NULL, 0, "LANMAN New Password (encrypted)", HFILL }},
 
 		{ &hf_old_password,
-			{ "Old Password", "lanman.old_password", FT_BYTES, BASE_HEX,
+			{ "Old Password", "lanman.old_password", FT_BYTES, BASE_NONE,
 			NULL, 0, "LANMAN Old Password (encrypted)", HFILL }},
 
 		{ &hf_reserved,
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index b7a39cc4c4..adf42f1649 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -6062,21 +6062,21 @@ proto_register_wsp(void)
 			{ 	"PDU Type",
 				"wsp.pdu_type",
 				 FT_UINT8, BASE_HEX, VALS( vals_pdu_type ), 0x00,
-				"PDU Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_version_major,
 			{ 	"Version (Major)",
 				"wsp.version.major",
 				 FT_UINT8, BASE_DEC, NULL, 0xF0,
-				"Version (Major)", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_version_minor,
 			{ 	"Version (Minor)",
 				"wsp.version.minor",
 				 FT_UINT8, BASE_DEC, NULL, 0x0F,
-				"Version (Minor)", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_capabilities_length,
@@ -6096,15 +6096,15 @@ proto_register_wsp(void)
 		{ &hf_capabilities_section,
 			{ 	"Capabilities",
 				"wsp.capabilities",
-				 FT_NONE, BASE_DEC, NULL, 0x00,
-				"Capabilities", HFILL
+				 FT_NONE, BASE_NONE, NULL, 0x00,
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_headers_section,
 			{ 	"Headers",
 				"wsp.headers",
-				 FT_NONE, BASE_DEC, NULL, 0x00,
-				"Headers", HFILL
+				 FT_NONE, BASE_NONE, NULL, 0x00,
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_header_uri_len,
@@ -6118,14 +6118,14 @@ proto_register_wsp(void)
 			{ 	"URI",
 				"wsp.uri",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"URI", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_server_session_id,
 			{ 	"Server Session ID",
 				"wsp.server.session_id",
 				 FT_UINT32, BASE_DEC, NULL, 0x00,
-				"Server Session ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_header_status,
@@ -6230,7 +6230,7 @@ proto_register_wsp(void)
 			{ 	"Data",
 				"wsp.reply.data",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Data", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_header_shift_code,
@@ -6260,8 +6260,8 @@ proto_register_wsp(void)
 		{ &hf_capa_protocol_options,
 			{	"Protocol Options",
 				"wsp.capability.protocol_opt",
-				 FT_STRING, BASE_HEX, NULL, 0x00,
-				"Protocol Options", HFILL
+				 FT_STRING, BASE_NONE, NULL, 0x00,
+				NULL, HFILL
 			}
 		},
 		{ &hf_capa_protocol_option_confirmed_push,
@@ -6303,35 +6303,35 @@ proto_register_wsp(void)
 			{	"Method MOR",
 				"wsp.capability.method_mor",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Method MOR", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_capa_push_mor,
 			{	"Push MOR",
 				"wsp.capability.push_mor",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Push MOR", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_capa_extended_methods,
 			{	"Extended Methods",
 				"wsp.capability.extended_methods",
-				 FT_STRING, BASE_HEX, NULL, 0x00,
-				"Extended Methods", HFILL
+				 FT_STRING, BASE_NONE, NULL, 0x00,
+				NULL, HFILL
 			}
 		},
 		{ &hf_capa_header_code_pages,
 			{	"Header Code Pages",
 				"wsp.capability.code_pages",
-				 FT_STRING, BASE_HEX, NULL, 0x00,
-				"Header Code Pages", HFILL
+				 FT_STRING, BASE_NONE, NULL, 0x00,
+				NULL, HFILL
 			}
 		},
 		{ &hf_capa_aliases,
 			{	"Aliases",
 				"wsp.capability.aliases",
 				 FT_BYTES, BASE_NONE, NULL, 0x00,
-				"Aliases", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_capa_client_message_size,
@@ -6359,7 +6359,7 @@ proto_register_wsp(void)
 			{ 	"Push Data",
 				"wsp.push.data",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Push Data", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_multipart_data,
@@ -6387,7 +6387,7 @@ proto_register_wsp(void)
 			{ 	"Permanent Redirect",
 				"wsp.redirect.flags.permanent",
 				 FT_BOOLEAN, 8, TFS(&tfs_yes_no), PERMANENT_REDIRECT,
-				"Permanent Redirect", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wsp_redirect_reuse_security_session,
@@ -6412,7 +6412,7 @@ proto_register_wsp(void)
 			{	"Address Record",
 				"wsp.address",
 				FT_UINT32, BASE_DEC, NULL, 0x00,
-				"Address Record", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_address_flags_length,
@@ -6440,21 +6440,21 @@ proto_register_wsp(void)
 			{ 	"Address Length",
 				"wsp.address.flags.length",
 				 FT_UINT8, BASE_DEC, NULL, ADDRESS_LEN,
-				"Address Length", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_address_bearer_type,
 			{ 	"Bearer Type",
 				"wsp.address.bearer_type",
 				 FT_UINT8, BASE_HEX, VALS(vals_bearer_types), 0x0,
-				"Bearer Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_address_port_num,
 			{ 	"Port Number",
 				"wsp.address.port",
 				 FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Port Number", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_address_ipv4_addr,