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

diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 6542639271..ee54e75975 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -897,49 +897,49 @@ proto_register_mount(void)
 	static hf_register_info hf[] = {
 		{ &hf_mount_procedure_v1, {
 			"V1 Procedure", "mount.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(mount1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(mount1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_mount_procedure_v2, {
 			"V2 Procedure", "mount.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(mount2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(mount2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_mount_procedure_v3, {
 			"V3 Procedure", "mount.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(mount3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(mount3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_sgi_mount_procedure_v1, {
 			"SGI V1 procedure", "mount.procedure_sgi_v1", FT_UINT32, BASE_DEC,
 			VALS(sgi_mount1_proc_vals), 0, "SGI V1 Procedure", HFILL }},
 		{ &hf_mount_path, {
-			"Path", "mount.path", FT_STRING, BASE_DEC,
-			NULL, 0, "Path", HFILL }},
+			"Path", "mount.path", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount3_status, {
 			"Status", "mount.status", FT_UINT32, BASE_DEC,
-			VALS(mount3_mountstat3), 0, "Status", HFILL }},
+			VALS(mount3_mountstat3), 0, NULL, HFILL }},
 		{ &hf_mount_mountlist_hostname, {
-			"Hostname", "mount.dump.hostname", FT_STRING, BASE_DEC,
-			NULL, 0, "Hostname", HFILL }},
+			"Hostname", "mount.dump.hostname", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_mountlist_directory, {
-			"Directory", "mount.dump.directory", FT_STRING, BASE_DEC,
-			NULL, 0, "Directory", HFILL }},
+			"Directory", "mount.dump.directory", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_mountlist, {
-			"Mount List Entry", "mount.dump.entry", FT_NONE, 0,
-			NULL, 0, "Mount List Entry", HFILL }},
+			"Mount List Entry", "mount.dump.entry", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_groups_group, {
-			"Group", "mount.export.group", FT_STRING, BASE_DEC,
-			NULL, 0, "Group", HFILL }},
+			"Group", "mount.export.group", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_groups, {
-			"Groups", "mount.export.groups", FT_NONE, 0,
-			NULL, 0, "Groups", HFILL }},
+			"Groups", "mount.export.groups", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_has_options, {
 			"Has options", "mount.export.has_options", FT_UINT32,
-			 BASE_DEC, NULL, 0, "Has options", HFILL }},
+			 BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_mount_options, {
-			"Options", "mount.export.options", FT_STRING, BASE_DEC,
-			NULL, 0, "Options", HFILL }},
+			"Options", "mount.export.options", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_exportlist_directory, {
-			"Directory", "mount.export.directory", FT_STRING, BASE_DEC,
-			NULL, 0, "Directory", HFILL }},
+			"Directory", "mount.export.directory", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_exportlist, {
-			"Export List Entry", "mount.export.entry", FT_NONE, 0,
-			NULL, 0, "Export List Entry", HFILL }},
+			"Export List Entry", "mount.export.entry", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_link_max, {
 			"Maximum number of links to a file", "mount.pathconf.link_max",
 			FT_UINT32, BASE_DEC,
@@ -951,15 +951,15 @@ proto_register_mount(void)
 		{ &hf_mount_pathconf_max_input, {
 			"Terminal input buffer size", "mount.pathconf.max_input",
 			FT_UINT16, BASE_DEC,
-			NULL, 0, "Terminal input buffer size", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_name_max, {
 			"Maximum file name length", "mount.pathconf.name_max",
 			FT_UINT16, BASE_DEC,
-			NULL, 0, "Maximum file name length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_path_max, {
 			"Maximum path name length", "mount.pathconf.path_max",
 			FT_UINT16, BASE_DEC,
-			NULL, 0, "Maximum path name length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_pipe_buf, {
 			"Pipe buffer size", "mount.pathconf.pipe_buf",
 			FT_UINT16, BASE_DEC,
@@ -975,43 +975,43 @@ proto_register_mount(void)
 		{ &hf_mount_pathconf_error_all, {
 			"ERROR_ALL",	"mount.pathconf.mask.error_all",
 			FT_BOOLEAN, 16, TFS(&tos_error_all),
-			PC_ERROR_ALL, "", HFILL }},
+			PC_ERROR_ALL, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_link_max, {
 			"ERROR_LINK_MAX", "mount.pathconf.mask.error_link_max",
 			FT_BOOLEAN, 16, TFS(&tos_error_link_max),
-			PC_ERROR_LINK_MAX, "", HFILL }},
+			PC_ERROR_LINK_MAX, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_max_canon, {
 			"ERROR_MAX_CANON", "mount.pathconf.mask.error_max_canon",
 			FT_BOOLEAN, 16, TFS(&tos_error_max_canon),
-			PC_ERROR_MAX_CANON, "", HFILL }},
+			PC_ERROR_MAX_CANON, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_max_input, {
 			"ERROR_MAX_INPUT", "mount.pathconf.mask.error_max_input",
 			FT_BOOLEAN, 16, TFS(&tos_error_max_input),
-			PC_ERROR_MAX_INPUT, "", HFILL }},
+			PC_ERROR_MAX_INPUT, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_name_max, {
 			"ERROR_NAME_MAX", "mount.pathconf.mask.error_name_max",
 			FT_BOOLEAN, 16, TFS(&tos_error_name_max),
-			PC_ERROR_NAME_MAX, "", HFILL }},
+			PC_ERROR_NAME_MAX, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_path_max, {
 			"ERROR_PATH_MAX", "mount.pathconf.mask.error_path_max",
 			FT_BOOLEAN, 16, TFS(&tos_error_path_max),
-			PC_ERROR_PATH_MAX, "", HFILL }},
+			PC_ERROR_PATH_MAX, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_pipe_buf, {
 			"ERROR_PIPE_BUF", "mount.pathconf.mask.error_pipe_buf",
 			FT_BOOLEAN, 16, TFS(&tos_error_pipe_buf),
-			PC_ERROR_PIPE_BUF, "", HFILL }},
+			PC_ERROR_PIPE_BUF, NULL, HFILL }},
 		{ &hf_mount_pathconf_chown_restricted, {
 			"CHOWN_RESTRICTED", "mount.pathconf.mask.chown_restricted",
 			FT_BOOLEAN, 16, TFS(&tos_chown_restricted),
-			PC_CHOWN_RESTRICTED, "", HFILL }},
+			PC_CHOWN_RESTRICTED, NULL, HFILL }},
 		{ &hf_mount_pathconf_no_trunc, {
 			"NO_TRUNC", "mount.pathconf.mask.no_trunc",
 			FT_BOOLEAN, 16, TFS(&tos_no_trunc),
-			PC_NO_TRUNC, "", HFILL }},
+			PC_NO_TRUNC, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_vdisable, {
 			"ERROR_VDISABLE", "mount.pathconf.mask.error_vdisable",
 			FT_BOOLEAN, 16, TFS(&tos_error_vdisable),
-			PC_ERROR_VDISABLE, "", HFILL }},
+			PC_ERROR_VDISABLE, NULL, HFILL }},
 		{ &hf_mount_statvfs_bsize, {
 			"Block size", "mount.statvfs.f_bsize",
 			FT_UINT32, BASE_DEC, NULL, 0,
@@ -1050,7 +1050,7 @@ proto_register_mount(void)
 			"File system identifier", HFILL }},
 		{ &hf_mount_statvfs_basetype, {
 			"Type", "mount.statvfs.f_basetype",
-			FT_STRING, BASE_DEC, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"File system type", HFILL }},
 		{ &hf_mount_statvfs_flag, {
 			"Flags", "mount.statvfs.f_flag",
@@ -1059,41 +1059,41 @@ proto_register_mount(void)
 		{ &hf_mount_statvfs_flag_rdonly, {
 			"ST_RDONLY", "mount.statvfs.f_flag.st_rdonly",
 			FT_BOOLEAN, 32, TFS(&tos_st_rdonly), ST_RDONLY,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_nosuid, {
 			"ST_NOSUID", "mount.statvfs.f_flag.st_nosuid",
 			FT_BOOLEAN, 32, TFS(&tos_st_nosuid), ST_NOSUID,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_notrunc, {
 			"ST_NOTRUNC", "mount.statvfs.f_flag.st_notrunc",
 			FT_BOOLEAN, 32, TFS(&tos_st_notrunc), ST_NOTRUNC,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_nodev, {
 			"ST_NODEV", "mount.statvfs.f_flag.st_nodev",
 			 FT_BOOLEAN, 32, TFS(&tos_st_nodev), ST_NODEV,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_grpid, {
 			"ST_GRPID", "mount.statvfs.f_flag.st_grpid",
 			FT_BOOLEAN, 32, TFS(&tos_st_grpid), ST_GRPID,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_local, {
 			"ST_LOCAL", "mount.statvfs.f_flag.st_local",
 			FT_BOOLEAN, 32, TFS(&tos_st_local), ST_LOCAL,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_namemax, {
 			"Maximum file name length", "mount.statvfs.f_namemax",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Maximum file name length", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_fstr, {
 			"File system specific string", "mount.statvfs.f_fstr",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"File system specific string", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_mount_flavors, {
 			"Flavors", "mount.flavors", FT_UINT32, BASE_DEC,
-			NULL, 0, "Flavors", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_flavor, {
 			"Flavor", "mount.flavor", FT_UINT32, BASE_DEC,
-			VALS(rpc_auth_flavor), 0, "Flavor", HFILL }},
+			VALS(rpc_auth_flavor), 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_mount,