Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748

1 files changed, 87 insertions, 87 deletions

diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index fe5b4253bd..37d7124d97 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -55527,7 +55527,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_extensionValue,
       { "extensionValue", "nbap.extensionValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_extensionValue", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PrivateIE_Container_item,
       { "PrivateIE-Field", "nbap.PrivateIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -55703,7 +55703,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_additional_e_DCH_DL_Control_Channel_Grant,
       { "additional-e-DCH-DL-Control-Channel-Grant", "nbap.additional_e_DCH_DL_Control_Channel_Grant",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_additional_EDCH_MAC_d_Flows_Specific_Information,
       { "additional-EDCH-MAC-d-Flows-Specific-Information", "nbap.additional_EDCH_MAC_d_Flows_Specific_Information",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -55851,7 +55851,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_Transmission_Gap_Pattern_Sequence_Status_List_item,
       { "Transmission-Gap-Pattern-Sequence-Status-List item", "nbap.Transmission_Gap_Pattern_Sequence_Status_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Transmission_Gap_Pattern_Sequence_Status_List_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_tGPSID,
       { "tGPSID", "nbap.tGPSID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -55975,7 +55975,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_CommonChannelsCapacityConsumptionLaw_item,
       { "CommonChannelsCapacityConsumptionLaw item", "nbap.CommonChannelsCapacityConsumptionLaw_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CommonChannelsCapacityConsumptionLaw_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_dl_Cost,
       { "dl-Cost", "nbap.dl_Cost",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -56327,11 +56327,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_notUsed_1_acknowledged_PCPCH_access_preambles,
       { "notUsed-1-acknowledged-PCPCH-access-preambles", "nbap.notUsed_1_acknowledged_PCPCH_access_preambles",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_notUsed_2_detected_PCPCH_access_preambles,
       { "notUsed-2-detected-PCPCH-access-preambles", "nbap.notUsed_2_detected_PCPCH_access_preambles",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_extension_CommonMeasurementValue,
       { "extension-CommonMeasurementValue", "nbap.extension_CommonMeasurementValue",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -56443,7 +56443,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_CriticalityDiagnostics_IE_List_item,
       { "CriticalityDiagnostics-IE-List item", "nbap.CriticalityDiagnostics_IE_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CriticalityDiagnostics_IE_List_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_iECriticality,
       { "iECriticality", "nbap.iECriticality",
         FT_UINT32, BASE_DEC, VALS(nbap_Criticality_vals), 0,
@@ -56663,7 +56663,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_hS_DSCH_SPS_Deactivate_Indicator_LCR,
       { "hS-DSCH-SPS-Deactivate-Indicator-LCR", "nbap.hS_DSCH_SPS_Deactivate_Indicator_LCR",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_e_DCH_Semi_PersistentScheduling_Information_LCR,
       { "e-DCH-Semi-PersistentScheduling-Information-LCR", "nbap.e_DCH_Semi_PersistentScheduling_Information_LCR",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -56675,7 +56675,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_e_DCH_SPS_Deactivate_Indicator_LCR,
       { "e-DCH-SPS-Deactivate-Indicator-LCR", "nbap.e_DCH_SPS_Deactivate_Indicator_LCR",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_hS_SCCH_DRX_Information_LCR,
       { "hS-SCCH-DRX-Information-LCR", "nbap.hS_SCCH_DRX_Information_LCR",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -56699,7 +56699,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_sameAsHS_SCCH,
       { "sameAsHS-SCCH", "nbap.sameAsHS_SCCH",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_e_AGCH_DRX_Parameters,
       { "e-AGCH-DRX-Parameters", "nbap.e_AGCH_DRX_Parameters",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -56727,7 +56727,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_deactivate,
       { "deactivate", "nbap.deactivate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_hS_SCCH_DRX_Information_ResponseLCR,
       { "hS-SCCH-DRX-Information-ResponseLCR", "nbap.hS_SCCH_DRX_Information_ResponseLCR",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -56839,7 +56839,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_DedicatedChannelsCapacityConsumptionLaw_item,
       { "DedicatedChannelsCapacityConsumptionLaw item", "nbap.DedicatedChannelsCapacityConsumptionLaw_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DedicatedChannelsCapacityConsumptionLaw_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_dl_Cost_1,
       { "dl-Cost-1", "nbap.dl_Cost_1",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -56907,7 +56907,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_separate_indication,
       { "separate-indication", "nbap.separate_indication",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_activate,
       { "activate", "nbap.activate",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -56943,7 +56943,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_unsynchronised,
       { "unsynchronised", "nbap.unsynchronised",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_dGANSS_ReferenceTime,
       { "dGANSS-ReferenceTime", "nbap.dGANSS_ReferenceTime",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -57247,7 +57247,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_remove,
       { "remove", "nbap.remove",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_E_AGCH_FDD_Code_List_item,
       { "FDD-DL-ChannelisationCodeNumber", "nbap.FDD_DL_ChannelisationCodeNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -57259,7 +57259,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_E_DCH_SF_allocation_item,
       { "E-DCH-SF-allocation item", "nbap.E_DCH_SF_allocation_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "E_DCH_SF_allocation_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_e_AGCH_And_E_RGCH_E_HICH_FDD_Scrambling_Code,
       { "e-AGCH-And-E-RGCH-E-HICH-FDD-Scrambling-Code", "nbap.e_AGCH_And_E_RGCH_E_HICH_FDD_Scrambling_Code",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -57331,7 +57331,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_e_DCH_Scheduled_Transmission_Grant,
       { "e-DCH-Scheduled-Transmission-Grant", "nbap.e_DCH_Scheduled_Transmission_Grant",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_E_DCH_LogicalChannelInformation_item,
       { "E-DCH-LogicalChannelInformationItem", "nbap.E_DCH_LogicalChannelInformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -57463,7 +57463,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_EDCH_RACH_Report_Value_item,
       { "EDCH-RACH-Report-Value item", "nbap.EDCH_RACH_Report_Value_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EDCH_RACH_Report_Value_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_granted_EDCH_RACH_resources,
       { "granted-EDCH-RACH-resources", "nbap.granted_EDCH_RACH_resources",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -57735,7 +57735,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_subframeNumber,
       { "subframeNumber", "nbap.subframeNumber",
         FT_UINT32, BASE_DEC, VALS(nbap_T_subframeNumber_vals), 0,
-        "T_subframeNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_n_E_UCCHLCR,
       { "n-E-UCCHLCR", "nbap.n_E_UCCHLCR",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -57839,7 +57839,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_non_broadcastIndication,
       { "non-broadcastIndication", "nbap.non_broadcastIndication",
         FT_UINT32, BASE_DEC, VALS(nbap_T_non_broadcastIndication_vals), 0,
-        "T_non_broadcastIndication", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_ganssSatInfoNavList,
       { "ganssSatInfoNavList", "nbap.ganssSatInfoNavList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -58047,7 +58047,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_ganss_SatelliteInfo,
       { "ganss-SatelliteInfo", "nbap.ganss_SatelliteInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_ganss_SatelliteInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_ganss_SatelliteInfo_item,
       { "ganss-SatelliteInfo item", "nbap.ganss_SatelliteInfo_item",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -58567,7 +58567,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_latitudeSign,
       { "latitudeSign", "nbap.latitudeSign",
         FT_UINT32, BASE_DEC, VALS(nbap_T_latitudeSign_vals), 0,
-        "T_latitudeSign", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_degreesOfLatitude,
       { "degreesOfLatitude", "nbap.degreesOfLatitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -58579,7 +58579,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_directionOfAltitude,
       { "directionOfAltitude", "nbap.directionOfAltitude",
         FT_UINT32, BASE_DEC, VALS(nbap_T_directionOfAltitude_vals), 0,
-        "T_directionOfAltitude", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_altitude,
       { "altitude", "nbap.altitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -58655,7 +58655,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_Ganss_Sat_Info_AddNavList_item,
       { "Ganss-Sat-Info-AddNavList item", "nbap.Ganss_Sat_Info_AddNavList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Ganss_Sat_Info_AddNavList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_svHealth,
       { "svHealth", "nbap.svHealth",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -58895,7 +58895,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_GANSS_Sat_Info_Nav_item,
       { "GANSS-Sat-Info-Nav item", "nbap.GANSS_Sat_Info_Nav_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "GANSS_Sat_Info_Nav_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_svHealth_01,
       { "svHealth", "nbap.svHealth",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -58939,7 +58939,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_gnss_to_id,
       { "gnss-to-id", "nbap.gnss_to_id",
         FT_UINT32, BASE_DEC, VALS(nbap_T_gnss_to_id_vals), 0,
-        "T_gnss_to_id", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_ganss_wk_number_01,
       { "ganss-wk-number", "nbap.ganss_wk_number",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -59111,7 +59111,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_no_bad_satellites,
       { "no-bad-satellites", "nbap.no_bad_satellites",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sat_info,
       { "sat-info", "nbap.sat_info",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -59255,7 +59255,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_process_Memory_Size,
       { "process-Memory-Size", "nbap.process_Memory_Size",
         FT_UINT32, BASE_DEC, VALS(nbap_T_process_Memory_Size_vals), 0,
-        "T_process_Memory_Size", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_HS_DSCHProvidedBitRate_item,
       { "HS-DSCHProvidedBitRate-Item", "nbap.HS_DSCHProvidedBitRate_Item",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -59603,7 +59603,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_uE_with_enhanced_HS_SCCH_support_indicator,
       { "uE-with-enhanced-HS-SCCH-support-indicator", "nbap.uE_with_enhanced_HS_SCCH_support_indicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_HS_SCCH_PreconfiguredCodes_item,
       { "HS-SCCH-PreconfiguredCodesItem", "nbap.HS_SCCH_PreconfiguredCodesItem",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -59975,7 +59975,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_onDemand,
       { "onDemand", "nbap.onDemand",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_periodic,
       { "periodic", "nbap.periodic",
         FT_UINT32, BASE_DEC, VALS(nbap_InformationReportCharacteristicsType_ReportPeriodicity_vals), 0,
@@ -60015,11 +60015,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_iP_SpacingFDD,
       { "iP-SpacingFDD", "nbap.iP_SpacingFDD",
         FT_UINT32, BASE_DEC, VALS(nbap_T_iP_SpacingFDD_vals), 0,
-        "T_iP_SpacingFDD", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_iP_Length,
       { "iP-Length", "nbap.iP_Length",
         FT_UINT32, BASE_DEC, VALS(nbap_T_iP_Length_vals), 0,
-        "T_iP_Length", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_seed,
       { "seed", "nbap.seed",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60035,7 +60035,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_iP_SpacingTDD,
       { "iP-SpacingTDD", "nbap.iP_SpacingTDD",
         FT_UINT32, BASE_DEC, VALS(nbap_T_iP_SpacingTDD_vals), 0,
-        "T_iP_SpacingTDD", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_iP_Start,
       { "iP-Start", "nbap.iP_Start",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60047,7 +60047,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_iP_PCCPCH,
       { "iP-PCCPCH", "nbap.iP_PCCPCH",
         FT_UINT32, BASE_DEC, VALS(nbap_T_iP_PCCPCH_vals), 0,
-        "T_iP_PCCPCH", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_iP_SpacingTDD_01,
       { "iP-SpacingTDD", "nbap.iP_SpacingTDD",
         FT_UINT32, BASE_DEC, VALS(nbap_T_iP_SpacingTDD_01_vals), 0,
@@ -60055,7 +60055,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_iP_Sub,
       { "iP-Sub", "nbap.iP_Sub",
         FT_UINT32, BASE_DEC, VALS(nbap_T_iP_Sub_vals), 0,
-        "T_iP_Sub", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_cFNOffset,
       { "cFNOffset", "nbap.cFNOffset",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60075,7 +60075,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_idleIntervalInfo_k,
       { "idleIntervalInfo-k", "nbap.idleIntervalInfo_k",
         FT_UINT32, BASE_DEC, VALS(nbap_T_idleIntervalInfo_k_vals), 0,
-        "T_idleIntervalInfo_k", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_idleIntervalInfo_offset,
       { "idleIntervalInfo-offset", "nbap.idleIntervalInfo_offset",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60087,7 +60087,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_maxPhysChPerTimeslot,
       { "maxPhysChPerTimeslot", "nbap.maxPhysChPerTimeslot",
         FT_UINT32, BASE_DEC, VALS(nbap_T_maxPhysChPerTimeslot_vals), 0,
-        "T_maxPhysChPerTimeslot", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_MACdPDU_Size_Indexlist_item,
       { "MACdPDU-Size-IndexItem", "nbap.MACdPDU_Size_IndexItem",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -60115,7 +60115,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_MessageStructure_item,
       { "MessageStructure item", "nbap.MessageStructure_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MessageStructure_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_repetitionNumber_01,
       { "repetitionNumber", "nbap.repetitionNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60135,11 +60135,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_defaultMidamble,
       { "defaultMidamble", "nbap.defaultMidamble",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_commonMidamble,
       { "commonMidamble", "nbap.commonMidamble",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_ueSpecificMidamble,
       { "ueSpecificMidamble", "nbap.ueSpecificMidamble",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60215,7 +60215,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_normal_and_diversity_primary_CPICH,
       { "normal-and-diversity-primary-CPICH", "nbap.normal_and_diversity_primary_CPICH",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_primary_and_secondary_CPICH_01,
       { "primary-and-secondary-CPICH", "nbap.primary_and_secondary_CPICH",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -60239,7 +60239,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_qPSK,
       { "qPSK", "nbap.qPSK",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sixteenQAM,
       { "sixteenQAM", "nbap.sixteenQAM",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -60259,7 +60259,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_NeighbouringCellMeasurementInformation_item,
       { "NeighbouringCellMeasurementInformation item", "nbap.NeighbouringCellMeasurementInformation_item",
         FT_UINT32, BASE_DEC, VALS(nbap_NeighbouringCellMeasurementInformation_item_vals), 0,
-        "NeighbouringCellMeasurementInformation_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_neighbouringFDDCellMeasurementInformation,
       { "neighbouringFDDCellMeasurementInformation", "nbap.neighbouringFDDCellMeasurementInformation",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -60399,7 +60399,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_none,
       { "none", "nbap.none",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_selected_MBMS_Service,
       { "selected-MBMS-Service", "nbap.selected_MBMS_Service",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -60427,7 +60427,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_transmission_Time_Interval,
       { "transmission-Time-Interval", "nbap.transmission_Time_Interval",
         FT_UINT32, BASE_DEC, VALS(nbap_T_transmission_Time_Interval_vals), 0,
-        "T_transmission_Time_Interval", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_tDM_Rep,
       { "tDM-Rep", "nbap.tDM_Rep",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60787,7 +60787,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_secondary_CPICH_shall_not_be_used,
       { "secondary-CPICH-shall-not-be-used", "nbap.secondary_CPICH_shall_not_be_used",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_serving_E_DCH_RL_in_this_NodeB,
       { "serving-E-DCH-RL-in-this-NodeB", "nbap.serving_E_DCH_RL_in_this_NodeB",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -60795,7 +60795,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_serving_E_DCH_RL_not_in_this_NodeB,
       { "serving-E-DCH-RL-not-in-this-NodeB", "nbap.serving_E_DCH_RL_not_in_this_NodeB",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_SetsOfHS_SCCH_Codes_item,
       { "SetsOfHS-SCCH-CodesItem", "nbap.SetsOfHS_SCCH_CodesItem",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -60815,11 +60815,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation,
       { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", "nbap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item,
       { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sFNSFNValue,
       { "sFNSFNValue", "nbap.sFNSFNValue",
         FT_UINT32, BASE_DEC, VALS(nbap_SFNSFNValue_vals), 0,
@@ -60843,11 +60843,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation,
       { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", "nbap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item,
       { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sFNSFNTimeStamp_FDD,
       { "sFNSFNTimeStamp-FDD", "nbap.sFNSFNTimeStamp_FDD",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -60983,15 +60983,15 @@ void proto_register_nbap(void) {
     { &hf_nbap_signalledGainFactors,
       { "signalledGainFactors", "nbap.signalledGainFactors",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signalledGainFactors", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_gainFactor,
       { "gainFactor", "nbap.gainFactor",
         FT_UINT32, BASE_DEC, VALS(nbap_T_gainFactor_vals), 0,
-        "T_gainFactor", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_fdd,
       { "fdd", "nbap.fdd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_fdd", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_betaC,
       { "betaC", "nbap.betaC",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61043,11 +61043,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_splitType,
       { "not-Used-splitType", "nbap.not_Used_splitType",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_not_Used_lengthOfTFCI2,
       { "not-Used-lengthOfTFCI2", "nbap.not_Used_lengthOfTFCI2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_TimeSlot_InitiatedListLCR_item,
       { "TimeSlotLCR", "nbap.TimeSlotLCR",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61075,7 +61075,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_Transmission_Gap_Pattern_Sequence_Information_item,
       { "Transmission-Gap-Pattern-Sequence-Information item", "nbap.Transmission_Gap_Pattern_Sequence_Information_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Transmission_Gap_Pattern_Sequence_Information_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_tGSN,
       { "tGSN", "nbap.tGSN",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61159,7 +61159,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_tFCSvalues,
       { "tFCSvalues", "nbap.tFCSvalues",
         FT_UINT32, BASE_DEC, VALS(nbap_T_tFCSvalues_vals), 0,
-        "T_tFCSvalues", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_no_Split_in_TFCI,
       { "no-Split-in-TFCI", "nbap.no_Split_in_TFCI",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61167,11 +61167,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_split_in_TFCI,
       { "not-Used-split-in-TFCI", "nbap.not_Used_split_in_TFCI",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_TFCS_TFCSList_item,
       { "TFCS-TFCSList item", "nbap.TFCS_TFCSList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "TFCS_TFCSList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_cTFC,
       { "cTFC", "nbap.cTFC",
         FT_UINT32, BASE_DEC, VALS(nbap_TFCS_CTFC_vals), 0,
@@ -61211,7 +61211,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_Transport_Block_Size_List_item,
       { "Transport-Block-Size-List item", "nbap.Transport_Block_Size_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Transport_Block_Size_List_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_transport_Block_Size_Index_for_Enhanced_PCH,
       { "transport-Block-Size-Index-for-Enhanced-PCH", "nbap.transport_Block_Size_Index_for_Enhanced_PCH",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61227,7 +61227,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_TransportFormatSet_DynamicPartList_item,
       { "TransportFormatSet-DynamicPartList item", "nbap.TransportFormatSet_DynamicPartList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "TransportFormatSet_DynamicPartList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_nrOfTransportBlocks,
       { "nrOfTransportBlocks", "nbap.nrOfTransportBlocks",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61247,7 +61247,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_TransmissionTimeIntervalInformation_item,
       { "TransmissionTimeIntervalInformation item", "nbap.TransmissionTimeIntervalInformation_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "TransmissionTimeIntervalInformation_item", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_transmissionTimeInterval,
       { "transmissionTimeInterval", "nbap.transmissionTimeInterval",
         FT_UINT32, BASE_DEC, VALS(nbap_TransportFormatSet_TransmissionTimeIntervalDynamic_vals), 0,
@@ -61283,7 +61283,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_notApplicable,
       { "notApplicable", "nbap.notApplicable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_tdd_02,
       { "tdd", "nbap.tdd",
         FT_UINT32, BASE_DEC, VALS(nbap_TransportFormatSet_SecondInterleavingMode_vals), 0,
@@ -61463,7 +61463,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_notUsed_pCPCHes_parameters,
       { "notUsed-pCPCHes-parameters", "nbap.notUsed_pCPCHes_parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_fdd_S_CCPCH_Offset,
       { "fdd-S-CCPCH-Offset", "nbap.fdd_S_CCPCH_Offset",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -61751,7 +61751,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_notUsed_cPCH_parameters,
       { "notUsed-cPCH-parameters", "nbap.notUsed_cPCH_parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_fACH_ParametersList_CTCH_ReconfRqstFDD,
       { "fACH-ParametersList-CTCH-ReconfRqstFDD", "nbap.fACH_ParametersList_CTCH_ReconfRqstFDD",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -61903,19 +61903,19 @@ void proto_register_nbap(void) {
     { &hf_nbap_notUsed_1_pCPCH_InformationList,
       { "notUsed-1-pCPCH-InformationList", "nbap.notUsed_1_pCPCH_InformationList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_notUsed_2_cPCH_InformationList,
       { "notUsed-2-cPCH-InformationList", "nbap.notUsed_2_cPCH_InformationList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_notUsed_3_aP_AICH_InformationList,
       { "notUsed-3-aP-AICH-InformationList", "nbap.notUsed_3_aP_AICH_InformationList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_notUsed_4_cDCA_ICH_InformationList,
       { "notUsed-4-cDCA-ICH-InformationList", "nbap.notUsed_4_cDCA_ICH_InformationList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sCH_Information,
       { "sCH-Information", "nbap.sCH_Information",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -62059,7 +62059,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_notUsed_cPCH,
       { "notUsed-cPCH", "nbap.notUsed_cPCH",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_extension_CommonMeasurementObjectType_CM_Rqst,
       { "extension-CommonMeasurementObjectType-CM-Rqst", "nbap.extension_CommonMeasurementObjectType_CM_Rqst",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -62503,7 +62503,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_yes_Deletion,
       { "yes-Deletion", "nbap.yes_Deletion",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sIB_Originator,
       { "sIB-Originator", "nbap.sIB_Originator",
         FT_UINT32, BASE_DEC, VALS(nbap_SIB_Originator_vals), 0,
@@ -62563,11 +62563,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_sSDT_CellID_Length,
       { "not-Used-sSDT-CellID-Length", "nbap.not_Used_sSDT_CellID_Length",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_not_Used_s_FieldLength,
       { "not-Used-s-FieldLength", "nbap.not_Used_s_FieldLength",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_dl_DPCH_SlotFormat,
       { "dl-DPCH-SlotFormat", "nbap.dl_DPCH_SlotFormat",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -62579,11 +62579,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_pDSCH_RL_ID,
       { "not-Used-pDSCH-RL-ID", "nbap.not_Used_pDSCH_RL_ID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_not_Used_pDSCH_CodeMapping,
       { "not-Used-pDSCH-CodeMapping", "nbap.not_Used_pDSCH_CodeMapping",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_01,
       { "powerOffsetInformation", "nbap.powerOffsetInformation",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -62611,7 +62611,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_sSDT_Cell_Identity,
       { "not-Used-sSDT-Cell-Identity", "nbap.not_Used_sSDT_Cell_Identity",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_hSDSCH_Configured_Indicator,
       { "hSDSCH-Configured-Indicator", "nbap.hSDSCH_Configured_Indicator",
         FT_UINT32, BASE_DEC, VALS(nbap_HSDSCH_Configured_Indicator_vals), 0,
@@ -62703,7 +62703,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_dSCH_InformationResponseList,
       { "not-Used-dSCH-InformationResponseList", "nbap.not_Used_dSCH_InformationResponseList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_sSDT_SupportIndicator,
       { "sSDT-SupportIndicator", "nbap.sSDT_SupportIndicator",
         FT_UINT32, BASE_DEC, VALS(nbap_SSDT_SupportIndicator_vals), 0,
@@ -62775,7 +62775,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_tFCI2_BearerInformationResponse,
       { "not-Used-tFCI2-BearerInformationResponse", "nbap.not_Used_tFCI2_BearerInformationResponse",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_combining_01,
       { "combining", "nbap.combining",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -62831,7 +62831,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_sSDT_CellIdentity,
       { "not-Used-sSDT-CellIdentity", "nbap.not_Used_sSDT_CellIdentity",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item,
       { "UL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -62991,7 +62991,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_sSDT_CellIDLength,
       { "not-Used-sSDT-CellIDLength", "nbap.not_Used_sSDT_CellIDLength",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_03,
       { "powerOffsetInformation", "nbap.powerOffsetInformation",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -63015,7 +63015,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_not_Used_sSDT_Indication,
       { "not-Used-sSDT-Indication", "nbap.not_Used_sSDT_Indication",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_04,
       { "powerOffsetInformation", "nbap.powerOffsetInformation",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -64231,7 +64231,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_nodeB,
       { "nodeB", "nbap.nodeB",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_communicationContextInfoList_Reset,
       { "communicationContextInfoList-Reset", "nbap.communicationContextInfoList_Reset",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -64427,11 +64427,11 @@ void proto_register_nbap(void) {
     { &hf_nbap_lateEntrantCell,
       { "lateEntrantCell", "nbap.lateEntrantCell",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_frequencyAcquisition,
       { "frequencyAcquisition", "nbap.frequencyAcquisition",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_cellSyncBurstMeasuredInfo,
       { "cellSyncBurstMeasuredInfo", "nbap.cellSyncBurstMeasuredInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -64455,7 +64455,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_cellSyncBurstNotAvailable,
       { "cellSyncBurstNotAvailable", "nbap.cellSyncBurstNotAvailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_cellSyncBurstSIR,
       { "cellSyncBurstSIR", "nbap.cellSyncBurstSIR",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -64479,7 +64479,7 @@ void proto_register_nbap(void) {
     { &hf_nbap_syncDLCodeIDNotAvailable,
       { "syncDLCodeIDNotAvailable", "nbap.syncDLCodeIDNotAvailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_syncDLCodeIdTiming,
       { "syncDLCodeIdTiming", "nbap.syncDLCodeIdTiming",
         FT_UINT32, BASE_DEC, VALS(nbap_CellSyncBurstTimingLCR_vals), 0,