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

diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 107f437aa1..1e2a63da43 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -1288,15 +1288,15 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_cbd_ansi_cbc,
 	    { "Change Back Code", "mtp3mg.cbc",
 	      FT_UINT16, BASE_DEC, NULL, ANSI_CBD_CBC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_cbd_itu_cbc,
 	    { "Change Back Code", "mtp3mg.cbc",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_cbd_japan_cbc,
 	    { "Change Back Code", "mtp3mg.cbc",
 	      FT_UINT8, BASE_DEC, NULL, JAPAN_CBD_CBC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_eco_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_ECO_SLC_MASK,
@@ -1304,19 +1304,19 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_tfc_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_ansi_status,
 	    { "Status", "mtp3mg.status",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_TFC_STATUS_MASK,
@@ -1324,7 +1324,7 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_tfc_itu_apc,
 	    { "Affected Point Code (ITU)", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_itu_status,
 	    { "Status", "mtp3mg.status",
 	      FT_UINT8, BASE_DEC, NULL, ITU_TFC_STATUS_MASK,
@@ -1332,95 +1332,95 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_tfc_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_spare,
 	    { "TFC spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_apc,
 	    { "Affected Point Code", "mtp3mg.japan_apc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_status,
 	    { "Status", "mtp3mg.japan_status",
 	      FT_UINT8, BASE_DEC, NULL, JAPAN_TFC_STATUS_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_status_spare,
 	    { "Spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT8, BASE_HEX, NULL, JAPAN_TFC_STATUS_SPARE_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_itu_apc,
 	    { "Affected Point Code (ITU)", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_japan_count,
 	    { "Count of Affected Point Codes (Japan)", "mtp3mg.japan_count",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_japan_apc,
 	    { "Affected Point Code", "mtp3mg.japan_apc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_japan_spare,
 	    { "Spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_itu_apc,
 	    { "Affected Point Code (ITU)", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_japan_count,
 	    { "Count of Affected Point Codes (Japan)", "mtp3mg.japan_count",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_japan_apc,
 	    { "Affected Point Code", "mtp3mg.japan_apc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_japan_spare,
 	    { "Spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_mim_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_MIM_SLC_MASK,
@@ -1440,31 +1440,31 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_upu_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_itu_apc,
 	    { "Affected Point Code", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_japan_apc,
 	    { "Affected Point Code", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, JAPAN_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_user,
 	    { "User", "mtp3mg.user",
 	      FT_UINT8, BASE_HEX, VALS(service_indicator_code_vals), UPU_USER_MASK,
@@ -1492,15 +1492,15 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_japan_test_spare,
 	    { "Japan test message spare", "mtp3mg.test.spare",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "Japan test message spare", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_japan_test_pattern,
 	    { "Japan test message pattern", "mtp3mg.test.pattern",
 	      FT_UINT16, BASE_HEX, NULL, 0x0,
-	      "Japan test message pattern", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_japan_spare,
 	    { "Japan management spare", "mtp3mg.spare",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "Japan management spare", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_test_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_TEST_SLC_MASK,