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

diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index d367681456..2602591a59 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -3047,11 +3047,11 @@ void proto_register_x2ap(void) {
         "x2ap.ServedCells", HFILL }},
     { &hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU,
       { "TargeteNBtoSource-eNBTransparentContainer", "x2ap.TargeteNBtoSource_eNBTransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TargeteNBtoSource_eNBTransparentContainer", HFILL }},
     { &hf_x2ap_TimeToWait_PDU,
       { "TimeToWait", "x2ap.TimeToWait",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TimeToWait", HFILL }},
     { &hf_x2ap_TraceActivation_PDU,
       { "TraceActivation", "x2ap.TraceActivation",
@@ -3247,7 +3247,7 @@ void proto_register_x2ap(void) {
         "x2ap.T_extensionValue", HFILL }},
     { &hf_x2ap_BroadcastPLMNs_Item_item,
       { "PLMN-Identity", "x2ap.PLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_radioNetwork,
       { "radioNetwork", "x2ap.radioNetwork",
@@ -3311,23 +3311,23 @@ void proto_register_x2ap(void) {
         "x2ap.TypeOfError", HFILL }},
     { &hf_x2ap_pLMN_Identity,
       { "pLMN-Identity", "x2ap.pLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_eUTRANcellIdentifier,
       { "eUTRANcellIdentifier", "x2ap.eUTRANcellIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.EUTRANCellIdentifier", HFILL }},
     { &hf_x2ap_macro_eNB_ID,
       { "macro-eNB-ID", "x2ap.macro_eNB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_x2ap_home_eNB_ID,
       { "home-eNB-ID", "x2ap.home_eNB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_x2ap_EPLMNs_item,
       { "PLMN-Identity", "x2ap.PLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_ForbiddenTAs_item,
       { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item",
@@ -3339,7 +3339,7 @@ void proto_register_x2ap(void) {
         "x2ap.ForbiddenTACs", HFILL }},
     { &hf_x2ap_ForbiddenTACs_item,
       { "TAC", "x2ap.TAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TAC", HFILL }},
     { &hf_x2ap_ForbiddenLAs_item,
       { "ForbiddenLAs-Item", "x2ap.ForbiddenLAs_Item",
@@ -3351,7 +3351,7 @@ void proto_register_x2ap(void) {
         "x2ap.ForbiddenLACs", HFILL }},
     { &hf_x2ap_ForbiddenLACs_item,
       { "LAC", "x2ap.LAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.LAC", HFILL }},
     { &hf_x2ap_sAE_Bearer_MaximumBitrateDL,
       { "sAE-Bearer-MaximumBitrateDL", "x2ap.sAE_Bearer_MaximumBitrateDL",
@@ -3375,11 +3375,11 @@ void proto_register_x2ap(void) {
         "x2ap.ENB_ID", HFILL }},
     { &hf_x2ap_transportLayerAddress,
       { "transportLayerAddress", "x2ap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TransportLayerAddress", HFILL }},
     { &hf_x2ap_gTP_TEID,
       { "gTP-TEID", "x2ap.gTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.GTP_TEI", HFILL }},
     { &hf_x2ap_GUGroupIDList_item,
       { "GU-Group-ID", "x2ap.GU_Group_ID",
@@ -3387,7 +3387,7 @@ void proto_register_x2ap(void) {
         "x2ap.GU_Group_ID", HFILL }},
     { &hf_x2ap_mME_Group_ID,
       { "mME-Group-ID", "x2ap.mME_Group_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.MME_Group_ID", HFILL }},
     { &hf_x2ap_gU_Group_ID,
       { "gU-Group-ID", "x2ap.gU_Group_ID",
@@ -3395,11 +3395,11 @@ void proto_register_x2ap(void) {
         "x2ap.GU_Group_ID", HFILL }},
     { &hf_x2ap_mMME_Code,
       { "mMME-Code", "x2ap.mMME_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.MME_Code", HFILL }},
     { &hf_x2ap_servingPLMN,
       { "servingPLMN", "x2ap.servingPLMN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_equivalentPLMNs,
       { "equivalentPLMNs", "x2ap.equivalentPLMNs",
@@ -3451,7 +3451,7 @@ void proto_register_x2ap(void) {
         "x2ap.ReportArea", HFILL }},
     { &hf_x2ap_rNTP_PerPRB,
       { "rNTP-PerPRB", "x2ap.rNTP_PerPRB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.BIT_STRING_SIZE_6_110_", HFILL }},
     { &hf_x2ap_rNTP_Threshold,
       { "rNTP-Threshold", "x2ap.rNTP_Threshold",
@@ -3495,7 +3495,7 @@ void proto_register_x2ap(void) {
         "x2ap.ECGI", HFILL }},
     { &hf_x2ap_tAC,
       { "tAC", "x2ap.tAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TAC", HFILL }},
     { &hf_x2ap_broadcastPLMNs,
       { "broadcastPLMNs", "x2ap.broadcastPLMNs",
@@ -3515,7 +3515,7 @@ void proto_register_x2ap(void) {
         "x2ap.Cell_Transmission_Bandwidth", HFILL }},
     { &hf_x2ap_traceReference,
       { "traceReference", "x2ap.traceReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TraceReference", HFILL }},
     { &hf_x2ap_interfacesToTrace,
       { "interfacesToTrace", "x2ap.interfacesToTrace",
@@ -3543,7 +3543,7 @@ void proto_register_x2ap(void) {
         "x2ap.UL_HighInterferenceIndicationInfo_Item", HFILL }},
     { &hf_x2ap_ul_interferenceindication,
       { "ul-interferenceindication", "x2ap.ul_interferenceindication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.UL_HighInterferenceIndication", HFILL }},
     { &hf_x2ap_target_Cell_ID,
       { "target-Cell-ID", "x2ap.target_Cell_ID",
@@ -3571,7 +3571,7 @@ void proto_register_x2ap(void) {
         "x2ap.Bearers_ToBeSetup_List", HFILL }},
     { &hf_x2ap_rRC_Context,
       { "rRC-Context", "x2ap.rRC_Context",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.RRC_Context", HFILL }},
     { &hf_x2ap_handoverRestrictionList,
       { "handoverRestrictionList", "x2ap.handoverRestrictionList",
@@ -3631,7 +3631,7 @@ void proto_register_x2ap(void) {
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_receiveStatusofULPDCPSDUs,
       { "receiveStatusofULPDCPSDUs", "x2ap.receiveStatusofULPDCPSDUs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.ReceiveStatusofULPDCPSDUs", HFILL }},
     { &hf_x2ap_uL_COUNTvalue,
       { "uL-COUNTvalue", "x2ap.uL_COUNTvalue",