From b228488bc0b9d5e0c63b15814836f7332f35ce04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
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

svn path=/trunk/; revision=28770
---
 epan/dissectors/packet-sabp.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index a219f95db6..ab3c935051 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -1672,14 +1672,14 @@ void proto_register_sabp(void) {
     { &hf_sabp_no_of_pages,
       { "Number-of-Pages", "sabp.no_of_pages",
         FT_UINT8, BASE_DEC, NULL, 0,
-        "Number-of-Pages", HFILL }},
+        NULL, HFILL }},
 
 
 /*--- Included file: packet-sabp-hfarr.c ---*/
 #line 1 "packet-sabp-hfarr.c"
     { &hf_sabp_Broadcast_Message_Content_PDU,
       { "Broadcast-Message-Content", "sabp.Broadcast_Message_Content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Broadcast_Message_Content", HFILL }},
     { &hf_sabp_Category_PDU,
       { "Category", "sabp.Category",
@@ -1699,7 +1699,7 @@ void proto_register_sabp(void) {
         "sabp.MessageStructure", HFILL }},
     { &hf_sabp_Data_Coding_Scheme_PDU,
       { "Data-Coding-Scheme", "sabp.Data_Coding_Scheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Data_Coding_Scheme", HFILL }},
     { &hf_sabp_Failure_List_PDU,
       { "Failure-List", "sabp.Failure_List",
@@ -1707,11 +1707,11 @@ void proto_register_sabp(void) {
         "sabp.Failure_List", HFILL }},
     { &hf_sabp_Message_Identifier_PDU,
       { "Message-Identifier", "sabp.Message_Identifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Message_Identifier", HFILL }},
     { &hf_sabp_New_Serial_Number_PDU,
       { "New-Serial-Number", "sabp.New_Serial_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.New_Serial_Number", HFILL }},
     { &hf_sabp_Number_of_Broadcasts_Completed_List_PDU,
       { "Number-of-Broadcasts-Completed-List", "sabp.Number_of_Broadcasts_Completed_List",
@@ -1723,7 +1723,7 @@ void proto_register_sabp(void) {
         "sabp.Number_of_Broadcasts_Requested", HFILL }},
     { &hf_sabp_Old_Serial_Number_PDU,
       { "Old-Serial-Number", "sabp.Old_Serial_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Old_Serial_Number", HFILL }},
     { &hf_sabp_Radio_Resource_Loading_List_PDU,
       { "Radio-Resource-Loading-List", "sabp.Radio_Resource_Loading_List",
@@ -1739,7 +1739,7 @@ void proto_register_sabp(void) {
         "sabp.Repetition_Period", HFILL }},
     { &hf_sabp_Serial_Number_PDU,
       { "Serial-Number", "sabp.Serial_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Serial_Number", HFILL }},
     { &hf_sabp_Service_Areas_List_PDU,
       { "Service-Areas-List", "sabp.Service_Areas_List",
@@ -1931,15 +1931,15 @@ void proto_register_sabp(void) {
         "sabp.Available_Bandwidth", HFILL }},
     { &hf_sabp_pLMNidentity,
       { "pLMNidentity", "sabp.pLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.PLMNidentity", HFILL }},
     { &hf_sabp_lac,
       { "lac", "sabp.lac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_sabp_sac,
       { "sac", "sabp.sac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_sabp_Service_Areas_List_item,
       { "Service-Area-Identifier", "sabp.Service_Area_Identifier",
-- 
cgit v1.2.3