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

diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 94e72c7c1f..f7c467ce49 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -582,13 +582,13 @@ void proto_register_smrse(void) {
 		NULL, 0, "Reserved byte, must be 126", HFILL }},
 	{ &hf_smrse_tag, {
 		"Tag", "smrse.tag", FT_UINT8, BASE_DEC,
-		VALS(tag_vals), 0, "Tag", HFILL }},
+		VALS(tag_vals), 0, NULL, HFILL }},
 	{ &hf_smrse_length, {
 		"Length", "smrse.length", FT_UINT16, BASE_DEC,
 		NULL, 0, "Length of SMRSE PDU", HFILL }},
     { &hf_smrse_Octet_Format,
       { "octet-Format", "smrse.octet_Format",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "SMS-Address/address-value/octet-format", HFILL }},
 
 
@@ -616,7 +616,7 @@ void proto_register_smrse(void) {
         "smrse.T_address_value", HFILL }},
     { &hf_smrse_octet_format,
       { "octet-format", "smrse.octet_format",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.T_octet_format", HFILL }},
     { &hf_smrse_connect_fail_reason,
       { "connect-fail-reason", "smrse.connect_fail_reason",
@@ -624,11 +624,11 @@ void proto_register_smrse(void) {
         "smrse.Connect_fail", HFILL }},
     { &hf_smrse_mt_priority_request,
       { "mt-priority-request", "smrse.mt_priority_request",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "smrse.BOOLEAN", HFILL }},
     { &hf_smrse_mt_mms,
       { "mt-mms", "smrse.mt_mms",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "smrse.BOOLEAN", HFILL }},
     { &hf_smrse_mt_message_reference,
       { "mt-message-reference", "smrse.mt_message_reference",
@@ -644,7 +644,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_mt_user_data,
       { "mt-user-data", "smrse.mt_user_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.RP_UD", HFILL }},
     { &hf_smrse_mt_origVMSCAddr,
       { "mt-origVMSCAddr", "smrse.mt_origVMSCAddr",
@@ -664,7 +664,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_mo_user_data,
       { "mo-user-data", "smrse.mo_user_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.RP_UD", HFILL }},
     { &hf_smrse_origVMSCAddr,
       { "origVMSCAddr", "smrse.origVMSCAddr",
@@ -672,7 +672,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_moimsi,
       { "moimsi", "smrse.moimsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.IMSI_Address", HFILL }},
     { &hf_smrse_message_reference,
       { "message-reference", "smrse.message_reference",
@@ -684,7 +684,7 @@ void proto_register_smrse(void) {
         "smrse.Error_reason", HFILL }},
     { &hf_smrse_msg_waiting_set,
       { "msg-waiting-set", "smrse.msg_waiting_set",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "smrse.BOOLEAN", HFILL }},
     { &hf_smrse_alerting_MS_ISDN,
       { "alerting-MS-ISDN", "smrse.alerting_MS_ISDN",
@@ -692,7 +692,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_sm_diag_info,
       { "sm-diag-info", "smrse.sm_diag_info",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.RP_UD", HFILL }},
     { &hf_smrse_ms_address,
       { "ms-address", "smrse.ms_address",