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

diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index c49df61003..bc5fcd0ed4 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -2990,68 +2990,68 @@ proto_register_afs(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_afs_fs, {	"File Server", "afs.fs",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "File Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_cb, {	"Callback", "afs.cb",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Callback", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_prot, { "Protection", "afs.prot",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Protection Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Protection Server", HFILL }},
 	{ &hf_afs_vldb, { "VLDB", "afs.vldb",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Location Database Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Volume Location Database Server", HFILL }},
 	{ &hf_afs_kauth, { "KAuth", "afs.kauth",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Kerberos Auth Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Kerberos Auth Server", HFILL }},
 	{ &hf_afs_vol, { "Volume Server", "afs.vol",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_error, { "Error", "afs.error",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Error", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_bos, { "BOS", "afs.bos",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Basic Oversee Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Basic Oversee Server", HFILL }},
 	{ &hf_afs_update, { "Update", "afs.update",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Update Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Update Server", HFILL }},
 	{ &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Rmtsys", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_ubik, { "Ubik", "afs.ubik",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Ubik", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_backup, { "Backup", "afs.backup",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Backup Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Backup Server", HFILL }},
 
 	{ &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(fs_req), 0, "Operation", HFILL }},
+	VALS(fs_req), 0, NULL, HFILL }},
 	{ &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(cb_req), 0, "Operation", HFILL }},
+	VALS(cb_req), 0, NULL, HFILL }},
 	{ &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(prot_req), 0, "Operation", HFILL }},
+	VALS(prot_req), 0, NULL, HFILL }},
 	{ &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(vldb_req), 0, "Operation", HFILL }},
+	VALS(vldb_req), 0, NULL, HFILL }},
 	{ &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(kauth_req), 0, "Operation", HFILL }},
+	VALS(kauth_req), 0, NULL, HFILL }},
 	{ &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(vol_req), 0, "Operation", HFILL }},
+	VALS(vol_req), 0, NULL, HFILL }},
 	{ &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(bos_req), 0, "Operation", HFILL }},
+	VALS(bos_req), 0, NULL, HFILL }},
 	{ &hf_afs_update_opcode, { "Operation", "afs.update.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(update_req), 0, "Operation", HFILL }},
+	VALS(update_req), 0, NULL, HFILL }},
 	{ &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(rmtsys_req), 0, "Operation", HFILL }},
+	VALS(rmtsys_req), 0, NULL, HFILL }},
 	{ &hf_afs_error_opcode, { "Operation", "afs.error.opcode",
 		FT_UINT32, BASE_DEC,
-	0, 0, "Operation", HFILL }},
+	0, 0, NULL, HFILL }},
 	{ &hf_afs_backup_opcode, {
 	"Operation", "afs.backup.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(backup_req), 0, "Operation", HFILL }},
+	VALS(backup_req), 0, NULL, HFILL }},
 	{ &hf_afs_ubik_opcode, {
 	"Operation", "afs.ubik.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(ubik_req), 0, "Operation", HFILL }},
+	VALS(ubik_req), 0, NULL, HFILL }},
 
 
 /* File Server Fields */
@@ -3066,137 +3066,137 @@ proto_register_afs(void)
 	0, 0, "File ID (Uniqifier)", HFILL }},
 	{ &hf_afs_fs_offset, { "Offset", "afs.fs.offset",
 		FT_UINT32, BASE_DEC,
-	0, 0, "Offset", HFILL }},
+	0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_length, { "Length", "afs.fs.length",
-		FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_flength, { "FLength", "afs.fs.flength",
-		FT_UINT32, BASE_DEC, 0, 0, "FLength", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_offset64, { "Offset64", "afs.fs.offset64",
 		FT_UINT64, BASE_DEC,
-	0, 0, "Offset64", HFILL }},
+	0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_length64, { "Length64", "afs.fs.length64",
-		FT_UINT64, BASE_DEC, 0, 0, "Length64", HFILL }},
+		FT_UINT64, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_flength64, { "FLength64", "afs.fs.flength64",
-		FT_UINT64, BASE_DEC, 0, 0, "FLength64", HFILL }},
+		FT_UINT64, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_fs_data, { "Data", "afs.fs.data",
-		FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_token, { "Token", "afs.fs.token",
-		FT_BYTES, BASE_HEX, 0, 0, "Token", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname",
-		FT_STRING, BASE_HEX, 0, 0, "Old Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_newname, { "New Name", "afs.fs.newname",
-		FT_STRING, BASE_HEX, 0, 0, "New Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_name, { "Name", "afs.fs.name",
-		FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name",
-		FT_STRING, BASE_HEX, 0, 0, "Symlink Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content",
-		FT_STRING, BASE_HEX, 0, 0, "Symlink Content", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Timestamp", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, "Volume Name", HFILL }},
 	{ &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd",
-		FT_STRING, BASE_HEX, 0, 0, "Message of the Day", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version",
-		FT_UINT32, BASE_DEC, 0, 0, "XStats Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion",
-		FT_UINT32, BASE_DEC, 0, 0, "Client Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_collnumber, { "Collection Number", "afs.fs.xstats.collnumber",
-		FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, "Collection Number", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp",
-		FT_UINT32, BASE_DEC, 0, 0, "XStats Timestamp", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1",
-		FT_UINT32, BASE_DEC, 0, 0, "CPS Spare1", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "CPS Spare2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "CPS Spare3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype",
-		FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, "Vice Lock Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, NULL, HFILL }},
 /* XXX - is this an IP address? */
 	{ &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid",
-		FT_UINT32, BASE_DEC, 0, 0, "Vice ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_ipaddr, { "IP Addr", "afs.fs.ipaddr",
-		FT_IPv4, BASE_HEX, 0, 0, "IP Addr", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 
 	{ &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask",
-		FT_UINT32, BASE_HEX, 0, 0, "Mask", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime",
-		FT_BOOLEAN, 32, 0, 0x00000001, "Set Modification Time", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000001, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner",
-		FT_BOOLEAN, 32, 0, 0x00000002, "Set Owner", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000002, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup",
-		FT_BOOLEAN, 32, 0, 0x00000004, "Set Group", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000004, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode",
-		FT_BOOLEAN, 32, 0, 0x00000008, "Set Mode", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000008, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize",
-		FT_BOOLEAN, 32, 0, 0x00000010, "Set Segment Size", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000010, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync",
-		FT_BOOLEAN, 32, 0, 0x00000400, "FSync", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000400, NULL, HFILL }},
 
 	{ &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Client Modification Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Server Modification Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner",
-		FT_UINT32, BASE_DEC, 0, 0, "Owner", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_group, { "Group", "afs.fs.status.group",
-		FT_UINT32, BASE_DEC, 0, 0, "Group", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode",
-		FT_UINT32, BASE_OCT, 0, 0, "Unix Mode", HFILL }},
+		FT_UINT32, BASE_OCT, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize",
-		FT_UINT32, BASE_DEC, 0, 0, "Segment Size", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion",
-		FT_UINT32, BASE_DEC, 0, 0, "Interface Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype",
-		FT_UINT32, BASE_DEC, 0, 0, "File Type", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_author, { "Author", "afs.fs.status.author",
-		FT_UINT32, BASE_DEC, 0, 0, "Author", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess",
-		FT_UINT32, BASE_DEC, 0, 0, "Caller Access", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess",
-		FT_UINT32, BASE_DEC, 0, 0, "Anonymous Access", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode",
-		FT_UINT32, BASE_DEC, 0, 0, "Parent VNode", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique",
-		FT_UINT32, BASE_DEC, 0, 0, "Parent Unique", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion",
-		FT_UINT32, BASE_DEC, 0, 0, "Data Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh",
-		FT_UINT32, BASE_DEC, 0, 0, "Data Version (High)", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount",
-		FT_UINT32, BASE_DEC, 0, 0, "Link Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter",
-		FT_UINT32, BASE_DEC, 0, 0, "Sync Counter", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_length, { "Length", "afs.fs.status.length",
-		FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 	{ &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Volume Creation Timestamp", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 	{ &hf_afs_fs_acl_count_positive, {
@@ -3210,7 +3210,7 @@ proto_register_afs(void)
 		FT_UINT32, BASE_DEC, 0, 0, "ACL Data Size", HFILL }},
 	{ &hf_afs_fs_acl_entity, {
 	"Entity (User/Group)", "afs.fs.acl.entity",
-		FT_STRING, BASE_HEX, 0, 0, "ACL Entity (User/Group)", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, "ACL Entity (User/Group)", HFILL }},
 	{ &hf_afs_fs_acl_r, {
 	"_R_ead", "afs.fs.acl.r",
 		FT_BOOLEAN, 8, 0, PRSFS_READ, "Read", HFILL }},
@@ -3230,184 +3230,184 @@ proto_register_afs(void)
 		FT_BOOLEAN, 8, 0, PRSFS_ADMINISTER, "Administer", HFILL }},
 
 	{ &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version",
-		FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires",
-		FT_RELATIVE_TIME, BASE_NONE, 0, 0, "Expires", HFILL }},
+		FT_RELATIVE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type",
-		FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }},
 
 /* BOS Server Fields */
 	{ &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_bos_type, { "Type", "afs.bos.type",
-		FT_STRING, BASE_HEX, 0, 0, "Type", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_content, { "Content", "afs.bos.content",
-		FT_STRING, BASE_HEX, 0, 0, "Content", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_data, { "Data", "afs.bos.data",
-		FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_path, { "Path", "afs.bos.path",
-		FT_STRING, BASE_HEX, 0, 0, "Path", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_parm, { "Parm", "afs.bos.parm",
-		FT_STRING, BASE_HEX, 0, 0, "Parm", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_error, { "Error", "afs.bos.error",
-		FT_STRING, BASE_HEX, 0, 0, "Error", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1",
-		FT_STRING, BASE_HEX, 0, 0, "Spare1", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2",
-		FT_STRING, BASE_HEX, 0, 0, "Spare2", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3",
-		FT_STRING, BASE_HEX, 0, 0, "Spare3", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_file, { "File", "afs.bos.file",
-		FT_STRING, BASE_HEX, 0, 0, "File", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_cmd, { "Command", "afs.bos.cmd",
-		FT_STRING, BASE_HEX, 0, 0, "Command", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_key, { "Key", "afs.bos.key",
-		FT_BYTES, BASE_HEX, 0, 0, "key", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, "key", HFILL }},
 	{ &hf_afs_bos_user, { "User", "afs.bos.user",
-		FT_STRING, BASE_HEX, 0, 0, "User", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_instance, { "Instance", "afs.bos.instance",
-		FT_STRING, BASE_HEX, 0, 0, "Instance", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_status, { "Status", "afs.bos.status",
-		FT_INT32, BASE_DEC, 0, 0, "Status", HFILL }},
+		FT_INT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc",
-		FT_STRING, BASE_DEC, 0, 0, "Status Description", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_num, { "Number", "afs.bos.number",
-		FT_UINT32, BASE_DEC, 0, 0, "Number", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_size, { "Size", "afs.bos.size",
-		FT_UINT32, BASE_DEC, 0, 0, "Size", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_flags, { "Flags", "afs.bos.flags",
-		FT_UINT32, BASE_DEC, 0, 0, "Flags", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_date, { "Date", "afs.bos.date",
-		FT_UINT32, BASE_DEC, 0, 0, "Date", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_cell, { "Cell", "afs.bos.cell",
-		FT_STRING, BASE_HEX, 0, 0, "Cell", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_host, { "Host", "afs.bos.host",
-		FT_STRING, BASE_HEX, 0, 0, "Host", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "New Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Backup Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Old Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Key Modification Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Checksum", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 /* KAUTH Server Fields */
 	{ &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ",
-		FT_STRING, BASE_HEX, 0, 0, "Principal", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm",
-		FT_STRING, BASE_HEX, 0, 0, "Realm", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain",
-		FT_STRING, BASE_HEX, 0, 0, "Domain", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_name, { "Name", "afs.kauth.name",
-		FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_data, { "Data", "afs.kauth.data",
-		FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 /* VOL Server Fields */
 	{ &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_vol_id, { "Volume ID", "afs.vol.id",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vol_count, { "Volume Count", "afs.vol.count",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vol_name, { "Volume Name", "afs.vol.name",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 
 /* VLDB Server Fields */
 	{ &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type",
-		FT_UINT32, BASE_HEX, VALS(volume_types), 0, "Volume Type", HFILL }},
+		FT_UINT32, BASE_HEX, VALS(volume_types), 0, NULL, HFILL }},
 	{ &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump",
-		FT_UINT32, BASE_DEC, 0, 0, "Bumped Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume Index", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers",
-		FT_UINT32, BASE_DEC, 0, 0, "Number of Servers", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex",
-		FT_UINT32, BASE_DEC, 0, 0, "Next Volume Index", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol",
-		FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol",
 		FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
 	{ &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol",
 		FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
 	{ &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol",
-		FT_UINT32, BASE_DEC, 0, 0, "Clone Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition",
-		FT_STRING, BASE_HEX, 0, 0, "Partition", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_server, { "Server", "afs.vldb.server",
-		FT_IPv4, BASE_HEX, 0, 0, "Server", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid",
-		FT_BYTES, BASE_HEX, 0, 0, "Server UUID", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq",
-		FT_UINT32, BASE_HEX, 0, 0, "Server Unique Address", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags",
-		FT_UINT32, BASE_HEX, 0, 0, "Server Flags", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip",
-		FT_IPv4, BASE_HEX, 0, 0, "Server IP", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags",
-		FT_UINT32, BASE_HEX, 0, 0, "Flags", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 
 	{ &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists",
-		FT_BOOLEAN, 32, 0, 0x1000, "Read/Write Exists", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x1000, NULL, HFILL }},
 	{ &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists",
-		FT_BOOLEAN, 32, 0, 0x2000, "Read-Only Exists", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x2000, NULL, HFILL }},
 	{ &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists",
-		FT_BOOLEAN, 32, 0, 0x4000, "Backup Exists", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x4000, NULL, HFILL }},
 	{ &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset",
-		FT_BOOLEAN, 32, 0, 0x8000, "DFS Fileset", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x8000, NULL, HFILL }},
 
 	{ &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 1", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 7", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 8", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 9", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 /* BACKUP Server Fields */
 	{ &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 
 /* CB Server Fields */
 	{ &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version",
-		FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Expires", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type",
-		FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }},
 	{ &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume",
 		FT_UINT32, BASE_DEC, 0, 0, "File ID (Volume)", HFILL }},
 	{ &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode",
@@ -3417,122 +3417,122 @@ proto_register_afs(void)
 
 /* PROT Server Fields */
 	{ &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_prot_name, { "Name", "afs.prot.name",
-		FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_id, { "ID", "afs.prot.id",
-		FT_UINT32, BASE_DEC, 0, 0, "ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid",
-		FT_UINT32, BASE_DEC, 0, 0, "Old ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_newid, { "New ID", "afs.prot.newid",
-		FT_UINT32, BASE_DEC, 0, 0, "New ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_gid, { "Group ID", "afs.prot.gid",
-		FT_UINT32, BASE_DEC, 0, 0, "Group ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_uid, { "User ID", "afs.prot.uid",
-		FT_UINT32, BASE_DEC, 0, 0, "User ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_count, { "Count", "afs.prot.count",
-		FT_UINT32, BASE_DEC, 0, 0, "Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid",
-		FT_UINT32, BASE_DEC, 0, 0, "Maximum Group ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid",
-		FT_UINT32, BASE_DEC, 0, 0, "Maximum User ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_pos, { "Position", "afs.prot.pos",
-		FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_flag, { "Flag", "afs.prot.flag",
-		FT_UINT32, BASE_HEX, 0, 0, "Flag", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 
 /* UBIK Fields */
 	{ &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_ubik_state, { "State", "afs.ubik.state",
-		FT_UINT32, BASE_HEX, 0, 0, "State", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Epoch", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter",
-		FT_UINT32, BASE_DEC, 0, 0, "Counter", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Vote Started", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Vote Ends", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_file, { "File", "afs.ubik.file",
-		FT_UINT32, BASE_DEC, 0, 0, "File", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_pos, { "Position", "afs.ubik.position",
-		FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_length, { "Length", "afs.ubik.length",
-		FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype",
-		FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, "Lock Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, NULL, HFILL }},
 	{ &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype",
-		FT_UINT32, BASE_HEX, 0, 0, "Vote Type", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_site, { "Site", "afs.ubik.site",
-		FT_IPv4, BASE_HEX, 0, 0, "Site", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface",
-		FT_IPv4, BASE_HEX, 0, 0, "Interface Address", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 
 	{ &hf_afs_ubik_now, { "Now", "afs.ubik.now",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Now", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost",
-		FT_IPv4, BASE_HEX, 0, 0, "Last Yes Host", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate",
-		FT_UINT32, BASE_HEX, 0, 0, "Last Yes State", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Claim", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost",
-		FT_IPv4, BASE_HEX, 0, 0, "Lowest Host", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Lowest Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost",
-		FT_IPv4, BASE_HEX, 0, 0, "Sync Host", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_addr, { "Address", "afs.ubik.addr",
-		FT_IPv4, BASE_HEX, 0, 0, "Address", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Vote Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Beacon Sent", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote",
-		FT_UINT32, BASE_HEX, 0, 0, "Last Vote", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb",
-		FT_UINT32, BASE_HEX, 0, 0, "Current DB", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_up, { "Up", "afs.ubik.up",
-		FT_UINT32, BASE_HEX, 0, 0, "Up", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown",
-		FT_UINT32, BASE_HEX, 0, 0, "Beacon Since Down", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite",
-		FT_UINT32, BASE_HEX, 0, 0, "Am Sync Site", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Site Until", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers",
-		FT_UINT32, BASE_HEX, 0, 0, "Number of Servers", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages",
-		FT_UINT32, BASE_HEX, 0, 0, "Locked Pages", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages",
-		FT_UINT32, BASE_HEX, 0, 0, "Write Locked Pages", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite",
-		FT_UINT32, BASE_HEX, 0, 0, "Active Write", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter",
-		FT_UINT32, BASE_HEX, 0, 0, "TID Counter", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks",
-		FT_UINT32, BASE_HEX, 0, 0, "Any Read Locks", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks",
-		FT_UINT32, BASE_HEX, 0, 0, "Any Write Locks", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate",
-		FT_UINT32, BASE_HEX, 0, 0, "Recovery State", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran",
-		FT_UINT32, BASE_HEX, 0, 0, "Current Transaction", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran",
-		FT_UINT32, BASE_HEX, 0, 0, "Write Transaction", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Epoch Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone",
-		FT_UINT32, BASE_HEX, 0, 0, "Is Clone", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_reqframe, { "Request Frame", "afs.reqframe",
-		FT_FRAMENUM, BASE_NONE, NULL, 0, "Request Frame", HFILL }},
+		FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_afs_repframe, { "Reply Frame", "afs.repframe",
-		FT_FRAMENUM, BASE_NONE,	NULL, 0, "Reply Frame", HFILL }},
+		FT_FRAMENUM, BASE_NONE,	NULL, 0, NULL, HFILL }},
 	{ &hf_afs_time, { "Time from request", "afs.time",
 		FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "Time between Request and Reply for AFS calls", HFILL }},
 	};