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-ulp.c b/epan/dissectors/packet-ulp.c
index 787d96b7cf..7464cb24f5 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -6608,7 +6608,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_rrlpPayload,
       { "rrlpPayload", "ulp.rrlpPayload",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_rrlpPayload", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_ver2_PosPayLoad_extension,
       { "ver2-PosPayLoad-extension", "ulp.ver2_PosPayLoad_extension",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -6880,7 +6880,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_endofsession,
       { "endofsession", "ulp.endofsession",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_reportPosition,
       { "reportPosition", "ulp.reportPosition",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -6908,7 +6908,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_moreComponents,
       { "moreComponents", "ulp.moreComponents",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_SessionList_item,
       { "SessionInformation", "ulp.SessionInformation",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -7044,7 +7044,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_emergencyCallLocation,
       { "emergencyCallLocation", "ulp.emergencyCallLocation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_serviceCapabilities,
       { "serviceCapabilities", "ulp.serviceCapabilities",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -7316,7 +7316,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_ganssDataBitSatList,
       { "ganssDataBitSatList", "ulp.ganssDataBitSatList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_ganssDataBitSatList", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_ganssDataBitSatList_item,
       { "ganssDataBitSatList item", "ulp.ganssDataBitSatList_item",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -7408,7 +7408,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_msisdn,
       { "msisdn", "ulp.msisdn",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_msisdn", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_mdn,
       { "mdn", "ulp.mdn",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -7420,7 +7420,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_imsi,
       { "imsi", "ulp.imsi",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_imsi", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_nai,
       { "nai", "ulp.nai",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -7484,7 +7484,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_latitudeSign,
       { "latitudeSign", "ulp.latitudeSign",
         FT_UINT32, BASE_DEC, VALS(ulp_T_latitudeSign_vals), 0,
-        "T_latitudeSign", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_latitude,
       { "latitude", "ulp.latitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -7496,7 +7496,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_uncertainty,
       { "uncertainty", "ulp.uncertainty",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_uncertainty", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_uncertaintySemiMajor,
       { "uncertaintySemiMajor", "ulp.uncertaintySemiMajor",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -7520,7 +7520,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_altitudeDirection,
       { "altitudeDirection", "ulp.altitudeDirection",
         FT_UINT32, BASE_DEC, VALS(ulp_T_altitudeDirection_vals), 0,
-        "T_altitudeDirection", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_altitude,
       { "altitude", "ulp.altitude",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -7660,11 +7660,11 @@ void proto_register_ulp(void) {
     { &hf_ulp_modeSpecificInfo,
       { "modeSpecificInfo", "ulp.modeSpecificInfo",
         FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_vals), 0,
-        "T_modeSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_fdd,
       { "fdd", "ulp.fdd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_fdd", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_primaryCPICH_Info,
       { "primaryCPICH-Info", "ulp.primaryCPICH_Info",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -7684,7 +7684,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_tdd,
       { "tdd", "ulp.tdd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tdd", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_cellParametersID,
       { "cellParametersID", "ulp.cellParametersID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -8024,7 +8024,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_apDevType_01,
       { "apDevType", "ulp.apDevType",
         FT_UINT32, BASE_DEC, VALS(ulp_T_apDevType_vals), 0,
-        "T_apDevType", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_mRL,
       { "mRL", "ulp.mRL",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -8084,7 +8084,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_cgi_Info,
       { "cgi-Info", "ulp.cgi_Info",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_cgi_Info", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_cellGlobalId,
       { "cellGlobalId", "ulp.cellGlobalId",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8092,7 +8092,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_measResult,
       { "measResult", "ulp.measResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_measResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_plmn_Identity,
       { "plmn-Identity", "ulp.plmn_Identity",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8132,7 +8132,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_apDeviceType,
       { "apDeviceType", "ulp.apDeviceType",
         FT_UINT32, BASE_DEC, VALS(ulp_T_apDeviceType_vals), 0,
-        "T_apDeviceType", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_apSignalStrength,
       { "apSignalStrength", "ulp.apSignalStrength",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8264,7 +8264,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_utran_GPSTimingOfCell,
       { "utran-GPSTimingOfCell", "ulp.utran_GPSTimingOfCell",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_utran_GPSTimingOfCell", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_ms_part,
       { "ms-part", "ulp.ms_part",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -8432,11 +8432,11 @@ void proto_register_ulp(void) {
     { &hf_ulp_sip_uri,
       { "sip-uri", "ulp.sip_uri",
         FT_STRING, BASE_NONE, NULL, 0,
-        "T_sip_uri", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_ims_public_identity,
       { "ims-public-identity", "ulp.ims_public_identity",
         FT_STRING, BASE_NONE, NULL, 0,
-        "T_ims_public_identity", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_min_01,
       { "min", "ulp.min",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -8444,7 +8444,7 @@ void proto_register_ulp(void) {
     { &hf_ulp_uri,
       { "uri", "ulp.uri",
         FT_STRING, BASE_NONE, NULL, 0,
-        "T_uri", HFILL }},
+        NULL, HFILL }},
     { &hf_ulp_appProvider,
       { "appProvider", "ulp.appProvider",
         FT_STRING, BASE_NONE, NULL, 0,