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

diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 0374dc2835..de03b56687 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -435,7 +435,7 @@ void proto_register_q1950(void) {
 		/* A.3 Bearer characteristics package */
 		{ &hf_h248_pkg_BCP,
 			{ "BCP (Bearer characteristics package)", "h248.pkg.BCP", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BCP_BNCChar,
 			{ "BNCChar (BNC Characteristics)", "h248.pkg.bcp.bncchar", 
@@ -445,7 +445,7 @@ void proto_register_q1950(void) {
 		/* A.4 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_BNCCT,
 			{ "BNCCT (Bearer network connection cut-through package)", "h248.pkg.BNCCT", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BNCCT_prop,
 			{ "Bearer network connection cut-through capability", "h248.pkg.bcp.bncct", 
@@ -454,27 +454,27 @@ void proto_register_q1950(void) {
 		
 		{ &hf_h248_pkg_GB,
 			{ "GB (Generic bearer connection)", "h248.pkg.GB", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange,
 			{ "BNCChange", "h248.pkg.GB.BNCChang", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange_type,
 			{ "Type", "h248.pkg.GB.BNCChang.Type", 
-			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, "", HFILL }
+			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_EstBNC,
 			{ "Type", "h248.pkg.GB.BNCChang.EstBNC", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
 		},
 		{ &hf_h248_pkg_GB_ModBNC,
 			{ "Type", "h248.pkg.GB.BNCChang.Type", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC,
 			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Generalcause,
 			{ "Generalcause", "h248.pkg.GB.BNCChang.RelBNC.Generalcause", 
@@ -482,17 +482,17 @@ void proto_register_q1950(void) {
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Failurecause,
 			{ "Failurecause", "h248.pkg.GB.BNCChang.RelBNC.Failurecause", 
-			FT_BYTES, BASE_HEX, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Reset,
 			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC", 
-			FT_BOOLEAN, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 
 		/* A.5 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_RI,
 			{ "RI (Reuse idle package)", "h248.pkg.RI", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_RII,
 			{ "Reuse Idle Indication", "h248.pkg.bcp.rii", 
@@ -501,70 +501,70 @@ void proto_register_q1950(void) {
 
 		{ &hf_h248_pkg_bt,
 			{ "BT (Bearer control Tunneling)", "h248.pkg.BT", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tunopt,
 			{ "Tunnelling Options", "h248.pkg.BT.TunOpt", 
-				FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }
+				FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tind,
 			{ "tind (Tunnel INDication)", "h248.pkg.BT.TIND", 
-				FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_bit,
 			{ "Bearer Information Transport", "h248.pkg.BT.BIT", 
-				FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		
 		
 		/* A.8 Basic call progress tones generator with directionality */
 		{ &hf_h248_pkg_bcg,
 			{ "bcg (Basic call progress tones generator with directionality)", "h248.pkg.bcg", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt_par_btd,
 			{ "btd (Tone Direction)", "h248.pkg.bcp.btd", 
-			FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, "btd (Tone Direction)", HFILL }
+			FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt,
 			{ "bdt (Dial Tone)", "h248.pkg.bcg.bdt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_brt,
 			{ "brt (Ringing tone)", "h248.pkg.bcg.brt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bbt,
 			{ "bbt (Busy tone)", "h248.pkg.bcg.bbt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bct,
 			{ "bct (Congestion tone)", "h248.pkg.bcg.bct", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bsit,
 			{ "bsit (Special information tone)", "h248.pkg.bcg.bsit", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bwt,
 			{ "bwt (Warning tone)", "h248.pkg.bcg.bwt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpt,
 			{ "bpt (Payphone recognition tone)", "h248.pkg.bcg.bpt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcw,
 			{ "bcw (Call waiting tone)", "h248.pkg.bcg.bcw", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcr,
 			{ "bcr (Call ringing tone)", "h248.pkg.bcg.bcr", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpy,
 			{ "bpy (Pay tone)", "h248.pkg.bcg.bpy", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 	};