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

diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index 91f7a96cd4..e679782fe5 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -450,40 +450,40 @@ void proto_register_h248_3gpp(void) {
 		{ &hf_h248_package_3GUP_Mode,
 		{ "Mode", "h248.package_3GUP.Mode",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_Mode_vals), 0,
-			"Mode", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_UPversions,
 		{ "UPversions", "h248.package_3GUP.upversions",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_upversions_vals), 0,
-			"UPversions", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_delerrsdu,
 		{ "Delivery of erroneous SDUs", "h248.package_3GUP.delerrsdu",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_delerrsdu_vals), 0,
-			"Delivery of erroneous SDUs", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_interface,
 		{ "Interface", "h248.package_3GUP.interface",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_interface_vals), 0,
-			"Interface", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_initdir,
 		{ "Initialisation Direction", "h248.package_3GUP.initdir",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_initdir_vals), 0,
-			"Initialisation Direction", HFILL }},
+			NULL, HFILL }},
 		
 		
 		{ &hf_h248_package_3GCSD,
 		{ "CSD Package", "h248.package_3GCSD",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Circuit Switched Data Package", HFILL }},
 		{ &hf_h248_package_3GCSD_plmnbc,
 		{ "PLMN Bearer Capability", "h248.package_3GCSD.plmnbc",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The PLMN Bearer Capability", HFILL }},
 		{ &hf_h248_package_3GCSD_gsmchancod,
 		{ "GSM channel coding", "h248.package_3GCSD.gsmchancod",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Channel information needed for GSM", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_protres,
 		{ "Protocol Negotiation Result", "h248.package_3GCSD.protres",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"This event is used to report the result of the protocol negotiation", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_protres_result,
 		{ "Negotiation Result", "h248.package_3GCSD.protres.result",
@@ -495,7 +495,7 @@ void proto_register_h248_3gpp(void) {
 			"indicates the possible failure cause", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_ratechg,
 		{ "Rate Change", "h248.package_3GCSD.ratechg",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"This event is used to report a rate change", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_ratechg_rate,
 		{ "New Rate", "h248.package_3GCSD.ratechg.rate",
@@ -503,7 +503,7 @@ void proto_register_h248_3gpp(void) {
 			"reports the new rate for the termination", HFILL }},
 		{ &hf_h248_pkg_3GCSD_sig_actprot,
 		{ "Activate Protocol", "h248.package_3GCSD.actprot",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Activate the higher layer protocol", HFILL }},
 		{ &hf_h248_pkg_3GCSD_actprot_sig_localpeer,
 		{ "Local Peer Role", "h248.package_3GCSD.actprot.localpeer",
@@ -512,8 +512,8 @@ void proto_register_h248_3gpp(void) {
 		
 
 		{ &hf_h248_package_3GTFO,
-		{ "Tandem Free Operation ", "h248.package_3GTFO",
-			FT_BYTES, BASE_HEX, NULL, 0,
+		{ "Tandem Free Operation", "h248.package_3GTFO",
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"This package defines events and properties for Tandem Free Operation (TFO) control", HFILL }},
 		{ &hf_h248_pkg_3GTFO_enable,
 		{ "TFO Activity Control", "h248.package_3GTFO.tfoenable",
@@ -521,35 +521,35 @@ void proto_register_h248_3gpp(void) {
 			"Defines if TFO is enabled or not", HFILL }},
 		{ &hf_h248_pkg_3GTFO_codeclist,
 		{ "TFO Codec List", "h248.package_3GTFO.codeclist",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"List of codecs for use in TFO protocol", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_codec_modify,
 		{ "Optimal Codec Event", "h248.package_3GTFO.codec_modify",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The event is used to notify the MGC that TFO negotiation has resulted in an optimal codec type being proposed", HFILL }},
 		{ &hf_h248_pkg_3GTFO_evt_codec_modify_optimalcodec,
 		{ "Optimal Codec Type", "h248.package_3GTFO.codec_modify.optimalcodec",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"indicates which is the proposed codec type for TFO", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_distant_codec_list,
 		{ "Codec List Event", "h248.package_3GTFO.distant_codec_list",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The event is used to notify the MGC of the distant TFO partner's supported codec list", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_distant_codec_list_distlist,
 		{ "Distant Codec List", "h248.package_3GTFO.distant_codec_list.distlist",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"indicates the codec list for TFO", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_status,
 		{ "TFO Status Event", "h248.package_3GTFO.status",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The event is used to notify the MGC that a TFO link has been established or broken", HFILL }},
 		{ &hf_h248_pkg_3GTFO_evt_status_tfostatus,
 		{ "TFO Status", "h248.package_3GTFO.status.tfostatus",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"reports whether TFO has been established or broken", HFILL }},
 	};