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

diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index a3f7673351..02182b4694 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -4791,7 +4791,7 @@ void proto_register_rrlp(void) {
         "rrlp.TimeSlotScheme", HFILL }},
     { &hf_rrlp_btsPosition,
       { "btsPosition", "rrlp.btsPosition",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.BTSPosition", HFILL }},
     { &hf_rrlp_msrAssistList,
       { "msrAssistList", "rrlp.msrAssistList",
@@ -5007,7 +5007,7 @@ void proto_register_rrlp(void) {
         "rrlp.FixType", HFILL }},
     { &hf_rrlp_posEstimate,
       { "posEstimate", "rrlp.posEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.Ext_GeographicalInformation", HFILL }},
     { &hf_rrlp_gpsMsrSetList,
       { "gpsMsrSetList", "rrlp.gpsMsrSetList",
@@ -5067,11 +5067,11 @@ void proto_register_rrlp(void) {
         "rrlp.AdditionalAssistanceData", HFILL }},
     { &hf_rrlp_gpsAssistanceData,
       { "gpsAssistanceData", "rrlp.gpsAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.GPSAssistanceData", HFILL }},
     { &hf_rrlp_ganssAssistanceData,
       { "ganssAssistanceData", "rrlp.ganssAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.GANSSAssistanceData", HFILL }},
     { &hf_rrlp_controlHeader,
       { "controlHeader", "rrlp.controlHeader",
@@ -5167,7 +5167,7 @@ void proto_register_rrlp(void) {
         "rrlp.BitNumber", HFILL }},
     { &hf_rrlp_threeDLocation,
       { "threeDLocation", "rrlp.threeDLocation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.Ext_GeographicalInformation", HFILL }},
     { &hf_rrlp_gpsTOW_02,
       { "gpsTOW", "rrlp.gpsTOW",
@@ -5675,7 +5675,7 @@ void proto_register_rrlp(void) {
         "rrlp.NULL", HFILL }},
     { &hf_rrlp_ganssPositionMethod,
       { "ganssPositionMethod", "rrlp.ganssPositionMethod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.GANSSPositioningMethod", HFILL }},
     { &hf_rrlp_ganss_AssistData,
       { "ganss-AssistData", "rrlp.ganss_AssistData",
@@ -6095,7 +6095,7 @@ void proto_register_rrlp(void) {
         "rrlp.INTEGER_0_255", HFILL }},
     { &hf_rrlp_svIDMask,
       { "svIDMask", "rrlp.svIDMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.SVIDMASK", HFILL }},
     { &hf_rrlp_toa,
       { "toa", "rrlp.toa",
@@ -6191,7 +6191,7 @@ void proto_register_rrlp(void) {
         "rrlp.INTEGER_M128_127", HFILL }},
     { &hf_rrlp_velEstimate,
       { "velEstimate", "rrlp.velEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.VelocityEstimate", HFILL }},
     { &hf_rrlp_ganssLocationInfo,
       { "ganssLocationInfo", "rrlp.ganssLocationInfo",
@@ -6219,7 +6219,7 @@ void proto_register_rrlp(void) {
         "rrlp.INTEGER_0_3", HFILL }},
     { &hf_rrlp_posData,
       { "posData", "rrlp.posData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.PositionData", HFILL }},
     { &hf_rrlp_stationaryIndication,
       { "stationaryIndication", "rrlp.stationaryIndication",
@@ -6292,23 +6292,23 @@ void proto_register_rrlp(void) {
     { &hf_rrlp_GANSSPositioningMethod_gps,
       { "gps", "rrlp.gps",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_galileo,
       { "galileo", "rrlp.galileo",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_PositionData_e_otd,
       { "e-otd", "rrlp.e-otd",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_PositionData_gps,
       { "gps", "rrlp.gps",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_PositionData_galileo,
       { "galileo", "rrlp.galileo",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-rrlp-hfarr.c ---*/
 #line 80 "packet-rrlp-template.c"