From c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 Mon Sep 17 00:00:00 2001
From: stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Thu, 18 Jun 2009 21:30:42 +0000
Subject: 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
---
 epan/dissectors/packet-t125.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'epan/dissectors/packet-t125.c')

diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index c959d98b6d..12eb324548 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -2205,15 +2205,15 @@ void proto_register_t125(void) {
         "t125.INTEGER_0_MAX", HFILL }},
     { &hf_t125_callingDomainSelector,
       { "callingDomainSelector", "t125.callingDomainSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_calledDomainSelector,
       { "calledDomainSelector", "t125.calledDomainSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_upwardFlag,
       { "upwardFlag", "t125.upwardFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "t125.BOOLEAN", HFILL }},
     { &hf_t125_targetParameters,
       { "targetParameters", "t125.targetParameters",
@@ -2229,7 +2229,7 @@ void proto_register_t125(void) {
         "t125.DomainParameters", HFILL }},
     { &hf_t125_userData,
       { "userData", "t125.userData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_result,
       { "result", "t125.result",
@@ -2273,7 +2273,7 @@ void proto_register_t125(void) {
         "t125.T_userId", HFILL }},
     { &hf_t125_joined,
       { "joined", "t125.joined",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "t125.BOOLEAN", HFILL }},
     { &hf_t125_userId_01,
       { "userId", "t125.userId",
@@ -2397,7 +2397,7 @@ void proto_register_t125(void) {
         "t125.Diagnostic", HFILL }},
     { &hf_t125_initialOctets,
       { "initialOctets", "t125.initialOctets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_initiator,
       { "initiator", "t125.initiator",
@@ -2429,7 +2429,7 @@ void proto_register_t125(void) {
         "t125.ChannelId", HFILL }},
     { &hf_t125_segmentation,
       { "segmentation", "t125.segmentation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.Segmentation", HFILL }},
     { &hf_t125_tokenStatus,
       { "tokenStatus", "t125.tokenStatus",
@@ -2626,11 +2626,11 @@ void proto_register_t125(void) {
     { &hf_t125_Segmentation_begin,
       { "begin", "t125.begin",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_t125_Segmentation_end,
       { "end", "t125.end",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-t125-hfarr.c ---*/
 #line 95 "packet-t125-template.c"
-- 
cgit v1.2.3