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

diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 77deab4d53..e68ad3ad58 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -13152,7 +13152,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_firstValue,
       { "firstValue", "ranap.firstValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_firstValue", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_secondCriticality,
       { "secondCriticality", "ranap.secondCriticality",
         FT_UINT32, BASE_DEC, VALS(ranap_Criticality_vals), 0,
@@ -13160,7 +13160,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_secondValue,
       { "secondValue", "ranap.secondValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_secondValue", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_ProtocolIE_ContainerList_item,
       { "ProtocolIE-Container", "ranap.ProtocolIE_Container",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13180,7 +13180,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_extensionValue,
       { "extensionValue", "ranap.extensionValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_extensionValue", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_PrivateIE_Container_item,
       { "PrivateIE-Field", "ranap.PrivateIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -13344,7 +13344,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_AuthorisedPLMNs_item,
       { "AuthorisedPLMNs item", "ranap.AuthorisedPLMNs_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AuthorisedPLMNs_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_pLMNidentity,
       { "pLMNidentity", "ranap.pLMNidentity",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -13444,7 +13444,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_CriticalityDiagnostics_IE_List_item,
       { "CriticalityDiagnostics-IE-List item", "ranap.CriticalityDiagnostics_IE_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CriticalityDiagnostics_IE_List_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_iECriticality,
       { "iECriticality", "ranap.iECriticality",
         FT_UINT32, BASE_DEC, VALS(ranap_Criticality_vals), 0,
@@ -13460,7 +13460,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_MessageStructure_item,
       { "MessageStructure item", "ranap.MessageStructure_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MessageStructure_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_item_repetitionNumber,
       { "repetitionNumber", "ranap.repetitionNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13568,7 +13568,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_latitudeSign,
       { "latitudeSign", "ranap.latitudeSign",
         FT_UINT32, BASE_DEC, VALS(ranap_T_latitudeSign_vals), 0,
-        "T_latitudeSign", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_latitude,
       { "latitude", "ranap.latitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13580,7 +13580,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_directionOfAltitude,
       { "directionOfAltitude", "ranap.directionOfAltitude",
         FT_UINT32, BASE_DEC, VALS(ranap_T_directionOfAltitude_vals), 0,
-        "T_directionOfAltitude", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_altitude,
       { "altitude", "ranap.altitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13628,7 +13628,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_GA_Polygon_item,
       { "GA-Polygon item", "ranap.GA_Polygon_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "GA_Polygon_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_uncertaintySemi_major,
       { "uncertaintySemi-major", "ranap.uncertaintySemi_major",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13724,7 +13724,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_LA_LIST_item,
       { "LA-LIST item", "ranap.LA_LIST_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LA_LIST_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_listOF_SNAs,
       { "listOF-SNAs", "ranap.listOF_SNAs",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13744,7 +13744,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_interface,
       { "interface", "ranap.interface",
         FT_UINT32, BASE_DEC, VALS(ranap_T_interface_vals), 0,
-        "T_interface", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_requestedLocationRelatedDataType,
       { "requestedLocationRelatedDataType", "ranap.requestedLocationRelatedDataType",
         FT_UINT32, BASE_DEC, VALS(ranap_RequestedLocationRelatedDataType_vals), 0,
@@ -13788,7 +13788,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_PLMNs_in_shared_network_item,
       { "PLMNs-in-shared-network item", "ranap.PLMNs_in_shared_network_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PLMNs_in_shared_network_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_lA_LIST,
       { "lA-LIST", "ranap.lA_LIST",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13892,7 +13892,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_emptyFullRAListofIdleModeUEs,
       { "emptyFullRAListofIdleModeUEs", "ranap.emptyFullRAListofIdleModeUEs",
         FT_UINT32, BASE_DEC, VALS(ranap_T_emptyFullRAListofIdleModeUEs_vals), 0,
-        "T_emptyFullRAListofIdleModeUEs", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_rAofIdleModeUEs,
       { "rAofIdleModeUEs", "ranap.rAofIdleModeUEs",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13992,7 +13992,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_traceActivationIndicator,
       { "traceActivationIndicator", "ranap.traceActivationIndicator",
         FT_UINT32, BASE_DEC, VALS(ranap_T_traceActivationIndicator_vals), 0,
-        "T_traceActivationIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_equipmentsToBeTraced,
       { "equipmentsToBeTraced", "ranap.equipmentsToBeTraced",
         FT_UINT32, BASE_DEC, VALS(ranap_EquipmentsToBeTraced_vals), 0,
@@ -14012,7 +14012,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_SDU_FormatInformationParameters_item,
       { "SDU-FormatInformationParameters item", "ranap.SDU_FormatInformationParameters_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SDU_FormatInformationParameters_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_subflowSDU_Size,
       { "subflowSDU-Size", "ranap.subflowSDU_Size",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -14024,7 +14024,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_SDU_Parameters_item,
       { "SDU-Parameters item", "ranap.SDU_Parameters_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SDU_Parameters_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_sDU_ErrorRatio,
       { "sDU-ErrorRatio", "ranap.sDU_ErrorRatio",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -14328,7 +14328,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_JoinedMBMSBearerService_IEs_item,
       { "JoinedMBMSBearerService-IEs item", "ranap.JoinedMBMSBearerService_IEs_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "JoinedMBMSBearerService_IEs_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_mBMS_PTP_RAB_ID,
       { "mBMS-PTP-RAB-ID", "ranap.mBMS_PTP_RAB_ID",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -14392,7 +14392,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_DataVolumeList_item,
       { "DataVolumeList item", "ranap.DataVolumeList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DataVolumeList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume,
       { "dl-UnsuccessfullyTransmittedDataVolume", "ranap.dl_UnsuccessfullyTransmittedDataVolume",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -14460,11 +14460,11 @@ void proto_register_ranap(void) {
     { &hf_ranap_LeftMBMSBearerService_IEs_item,
       { "LeftMBMSBearerService-IEs item", "ranap.LeftMBMSBearerService_IEs_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LeftMBMSBearerService_IEs_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_UnsuccessfulLinking_IEs_item,
       { "UnsuccessfulLinking-IEs item", "ranap.UnsuccessfulLinking_IEs_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "UnsuccessfulLinking_IEs_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_initiatingMessage,
       { "initiatingMessage", "ranap.initiatingMessage",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -14496,7 +14496,7 @@ void proto_register_ranap(void) {
     { &hf_ranap_value,
       { "value", "ranap.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_value", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-ranap-hfarr.c ---*/
 #line 299 "packet-ranap-template.c"