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


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

1 files changed, 20 insertions, 20 deletions

diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 34fa46bfaa..c215c30829 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -1850,58 +1850,58 @@ static void register_radius_fields(const char* unused _U_) {
 			 "TRUE if RADIUS response", HFILL }},
 		 { &hf_radius_req_frame,
 		 { "Request Frame", "radius.reqframe", FT_FRAMENUM, BASE_NONE, NULL, 0,
-			 "Request Frame", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_rsp_frame,
 		 { "Response Frame", "radius.rspframe", FT_FRAMENUM, BASE_NONE, NULL, 0,
-			 "Response Frame", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_time,
 		 { "Time from request", "radius.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0,
 			 "Timedelta between Request and Response", HFILL }},
 		 { &hf_radius_code,
 		 { "Code","radius.code", FT_UINT8, BASE_DEC, VALS(radius_vals), 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_id,
 		 { "Identifier",	"radius.id", FT_UINT8, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_authenticator,
-		 { "Authenticator",	"radius.authenticator", FT_BYTES, BASE_HEX, NULL, 0x0,
-			 "", HFILL }},
+		 { "Authenticator",	"radius.authenticator", FT_BYTES, BASE_NONE, NULL, 0x0,
+			 NULL, HFILL }},
 		 { &hf_radius_length,
 		 { "Length","radius.length", FT_UINT16, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &(no_dictionary_entry.hf),
-		 { "Unknown-Attribute","radius.Unknown_Attribute", FT_BYTES, BASE_HEX, NULL, 0x0,
-			 "", HFILL }},
+		 { "Unknown-Attribute","radius.Unknown_Attribute", FT_BYTES, BASE_NONE, NULL, 0x0,
+			 NULL, HFILL }},
 		 { &(no_dictionary_entry.hf_len),
 		 { "Unknown-Attribute Length","radius.Unknown_Attribute.length", FT_UINT8, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_framed_ip_address,
 		 { "Framed-IP-Address","radius.Framed-IP-Address", FT_IPv4, BASE_NONE, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_login_ip_host,
 		 { "Login-IP-Host","radius.Login-IP-Host", FT_IPv4, BASE_NONE, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_framed_ipx_network,
 		 { "Framed-IPX-Network","radius.Framed-IPX-Network", FT_IPXNET, BASE_NONE, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_cosine_vpi,
 		 { "Cosine-VPI","radius.Cosine-Vpi", FT_UINT16, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_cosine_vci,
 		 { "Cosine-VCI","radius.Cosine-Vci", FT_UINT16, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_dup,
 		 { "Duplicate Message", "radius.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-			 "Duplicate Message", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_req_dup,
 		 { "Duplicate Request", "radius.req.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-			 "Duplicate Request", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_rsp_dup,
 		 { "Duplicate Response", "radius.rsp.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-			 "Duplicate Response", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_ascend_data_filter,
-		 { "Ascend Data Filter", "radius.ascenddatafilter", FT_BYTES, BASE_HEX, NULL, 0x0,
-			 "Ascend Data Filter", HFILL }}
+		 { "Ascend Data Filter", "radius.ascenddatafilter", FT_BYTES, BASE_NONE, NULL, 0x0,
+			 NULL, HFILL }}
 	 };
 	 
 	 gint *base_ett[] = {