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

diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index b6de03d352..e26ff49c9f 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -1386,95 +1386,95 @@ proto_register_diameter(void)
 	hf_register_info hf_base[] = {
 	{ &hf_diameter_version,
 		  { "Version", "diameter.version", FT_UINT8, BASE_HEX, NULL, 0x00,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_length,
 		  { "Length","diameter.length", FT_UINT24, BASE_DEC, NULL, 0x0,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags,
 		  { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_request,
 		  { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_proxyable,
 		  { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_error,
 		  { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_T,
 		  { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_reserved4,
 		  { "Reserved","diameter.flags.reserved4", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED4, "", HFILL }},
+			  DIAM_FLAGS_RESERVED4, NULL, HFILL }},
 	{ &hf_diameter_flags_reserved5,
 		  { "Reserved","diameter.flags.reserved5", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED5, "", HFILL }},
+			  DIAM_FLAGS_RESERVED5, NULL, HFILL }},
 	{ &hf_diameter_flags_reserved6,
 		  { "Reserved","diameter.flags.reserved6", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED6, "", HFILL }},
+			  DIAM_FLAGS_RESERVED6, NULL, HFILL }},
 	{ &hf_diameter_flags_reserved7,
 		  { "Reserved","diameter.flags.reserved7", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED7, "", HFILL }},
+			  DIAM_FLAGS_RESERVED7, NULL, HFILL }},
 	{ &hf_diameter_vendor_id,
 		  { "VendorId",	"diameter.vendorId", FT_UINT32, BASE_DEC, VALS(sminmpec_values),
-			  0x0,"", HFILL }},
+			  0x0,NULL, HFILL }},
 	{ &hf_diameter_application_id,
 		  { "ApplicationId",	"diameter.applicationId", FT_UINT32, BASE_DEC, dictionary.applications,
-			  0x0,"", HFILL }},
+			  0x0,NULL, HFILL }},
 	{ &hf_diameter_hopbyhopid,
 		  { "Hop-by-Hop Identifier", "diameter.hopbyhopid", FT_UINT32,
-			  BASE_HEX, NULL, 0x0, "", HFILL }},
+			  BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_endtoendid,
 		  { "End-to-End Identifier", "diameter.endtoendid", FT_UINT32,
-			  BASE_HEX, NULL, 0x0, "", HFILL }},
+			  BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp,
-		  { "AVP","diameter.avp", FT_BYTES, BASE_HEX,
-			  NULL, 0x0, "", HFILL }},
+		  { "AVP","diameter.avp", FT_BYTES, BASE_NONE,
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_len,
 		  { "AVP Length","diameter.avp.len", FT_UINT24, BASE_DEC,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_flags,
 		  { "AVP Flags","diameter.avp.flags", FT_UINT8, BASE_HEX,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_flags_vendor_specific,
 		  { "Vendor-Specific", "diameter.flags.vendorspecific", FT_BOOLEAN, 8, TFS(&flags_set_truth), AVP_FLAGS_V,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_avp_flags_mandatory,
 		  { "Mandatory", "diameter.flags.mandatory", FT_BOOLEAN, 8, TFS(&flags_set_truth), AVP_FLAGS_M,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_avp_flags_protected,
 		  { "Protected","diameter.avp.flags.protected", FT_BOOLEAN, 8, TFS(&flags_set_truth), AVP_FLAGS_P,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved3,
 		  { "Reserved","diameter.avp.flags.reserved3", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED3,	"", HFILL }},
+			  AVP_FLAGS_RESERVED3,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved4,
 		  { "Reserved","diameter.avp.flags.reserved4", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED4,	"", HFILL }},
+			  AVP_FLAGS_RESERVED4,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved5,
 		  { "Reserved","diameter.avp.flags.reserved5", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED5,	"", HFILL }},
+			  AVP_FLAGS_RESERVED5,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved6,
 		  { "Reserved","diameter.avp.flags.reserved6", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED6,	"", HFILL }},
+			  AVP_FLAGS_RESERVED6,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved7,
 		  { "Reserved","diameter.avp.flags.reserved7", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED7,	"", HFILL }},
+			  AVP_FLAGS_RESERVED7,	NULL, HFILL }},
 	{ &hf_diameter_avp_vendor_id,
 		  { "AVP Vendor Id","diameter.avp.vendorId", FT_UINT32, BASE_DEC,
-			  VALS(sminmpec_values), 0x0, "", HFILL }},
+			  VALS(sminmpec_values), 0x0, NULL, HFILL }},
 	{ &(unknown_avp.hf_value),
 		  { "Value","diameter.avp.unknown", FT_BYTES, BASE_NONE,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_data_wrong_length,
 		  { "Data","diameter.avp.invalid-data", FT_BYTES, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_code,
-		  { "Command Code", "diameter.cmd.code", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+		  { "Command Code", "diameter.cmd.code", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_diameter_avp_code,
-		  { "AVP Code", "diameter.avp.code", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+		  { "AVP Code", "diameter.avp.code", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_diameter_answer_in,
 		{ "Answer In", "diameter.answer_in", FT_FRAMENUM, BASE_DEC, NULL, 0x0,
 		"The answer to this diameter request is in this frame", HFILL }},