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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32748 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 88 insertions, 88 deletions

diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index c04a50ec67..0ea1d9823f 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -9798,7 +9798,7 @@ void proto_register_inap(void) {
     { &hf_inap_value,
       { "value", "inap.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_value", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_AlternativeIdentities_item,
       { "AlternativeIdentity", "inap.AlternativeIdentity",
         FT_UINT32, BASE_DEC, VALS(inap_AlternativeIdentity_vals), 0,
@@ -9834,11 +9834,11 @@ void proto_register_inap(void) {
     { &hf_inap_gapAllInTraffic,
       { "gapAllInTraffic", "inap.gapAllInTraffic",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_calledAddressAndService,
       { "calledAddressAndService", "inap.calledAddressAndService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_calledAddressAndService", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_serviceKey,
       { "serviceKey", "inap.serviceKey",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -9846,7 +9846,7 @@ void proto_register_inap(void) {
     { &hf_inap_callingAddressAndService,
       { "callingAddressAndService", "inap.callingAddressAndService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_callingAddressAndService", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_callingAddressValue,
       { "callingAddressValue", "inap.callingAddressValue",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -9874,7 +9874,7 @@ void proto_register_inap(void) {
     { &hf_inap_bearerCap,
       { "bearerCap", "inap.bearerCap",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_bearerCap", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tmr,
       { "tmr", "inap.tmr",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -9958,7 +9958,7 @@ void proto_register_inap(void) {
     { &hf_inap_action,
       { "action", "inap.action",
         FT_UINT32, BASE_DEC, VALS(inap_T_action_vals), 0,
-        "T_action", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_treatment,
       { "treatment", "inap.treatment",
         FT_UINT32, BASE_DEC, VALS(inap_GapTreatment_vals), 0,
@@ -10070,7 +10070,7 @@ void proto_register_inap(void) {
     { &hf_inap_numberOfDigitsTwo,
       { "numberOfDigitsTwo", "inap.numberOfDigitsTwo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_numberOfDigitsTwo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_requestedNumberOfDigits,
       { "requestedNumberOfDigits", "inap.requestedNumberOfDigits",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -10090,7 +10090,7 @@ void proto_register_inap(void) {
     { &hf_inap_collectedInfoSpecificInfo,
       { "collectedInfoSpecificInfo", "inap.collectedInfoSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_collectedInfoSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_calledPartynumber,
       { "calledPartynumber", "inap.calledPartynumber",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10098,11 +10098,11 @@ void proto_register_inap(void) {
     { &hf_inap_analysedInfoSpecificInfo,
       { "analysedInfoSpecificInfo", "inap.analysedInfoSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_analysedInfoSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_routeSelectFailureSpecificInfo,
       { "routeSelectFailureSpecificInfo", "inap.routeSelectFailureSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_routeSelectFailureSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_failureCause,
       { "failureCause", "inap.failureCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10110,7 +10110,7 @@ void proto_register_inap(void) {
     { &hf_inap_oCalledPartyBusySpecificInfo,
       { "oCalledPartyBusySpecificInfo", "inap.oCalledPartyBusySpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oCalledPartyBusySpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_busyCause,
       { "busyCause", "inap.busyCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10118,7 +10118,7 @@ void proto_register_inap(void) {
     { &hf_inap_oNoAnswerSpecificInfo,
       { "oNoAnswerSpecificInfo", "inap.oNoAnswerSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oNoAnswerSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_cause,
       { "cause", "inap.cause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10126,7 +10126,7 @@ void proto_register_inap(void) {
     { &hf_inap_oAnswerSpecificInfo,
       { "oAnswerSpecificInfo", "inap.oAnswerSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oAnswerSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_backwardGVNS,
       { "backwardGVNS", "inap.backwardGVNS",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10134,7 +10134,7 @@ void proto_register_inap(void) {
     { &hf_inap_oMidCallSpecificInfo,
       { "oMidCallSpecificInfo", "inap.oMidCallSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oMidCallSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_connectTime,
       { "connectTime", "inap.connectTime",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -10146,7 +10146,7 @@ void proto_register_inap(void) {
     { &hf_inap_oDisconnectSpecificInfo,
       { "oDisconnectSpecificInfo", "inap.oDisconnectSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oDisconnectSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_releaseCause,
       { "releaseCause", "inap.releaseCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10154,19 +10154,19 @@ void proto_register_inap(void) {
     { &hf_inap_tBusySpecificInfo,
       { "tBusySpecificInfo", "inap.tBusySpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tBusySpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tNoAnswerSpecificInfo,
       { "tNoAnswerSpecificInfo", "inap.tNoAnswerSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tNoAnswerSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tAnswerSpecificInfo,
       { "tAnswerSpecificInfo", "inap.tAnswerSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tAnswerSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tMidCallSpecificInfo,
       { "tMidCallSpecificInfo", "inap.tMidCallSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tMidCallSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tMidCallInfo,
       { "tMidCallInfo", "inap.tMidCallInfo",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -10174,43 +10174,43 @@ void proto_register_inap(void) {
     { &hf_inap_tDisconnectSpecificInfo,
       { "tDisconnectSpecificInfo", "inap.tDisconnectSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tDisconnectSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_oTermSeizedSpecificInfo,
       { "oTermSeizedSpecificInfo", "inap.oTermSeizedSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oTermSeizedSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_oSuspend,
       { "oSuspend", "inap.oSuspend",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oSuspend", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tSuspend,
       { "tSuspend", "inap.tSuspend",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tSuspend", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_origAttemptAuthorized,
       { "origAttemptAuthorized", "inap.origAttemptAuthorized",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_origAttemptAuthorized", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_oReAnswer,
       { "oReAnswer", "inap.oReAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oReAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tReAnswer,
       { "tReAnswer", "inap.tReAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tReAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_facilitySelectedAndAvailable,
       { "facilitySelectedAndAvailable", "inap.facilitySelectedAndAvailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_facilitySelectedAndAvailable", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_callAccepted,
       { "callAccepted", "inap.callAccepted",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_callAccepted", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_oAbandon,
       { "oAbandon", "inap.oAbandon",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oAbandon", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_abandonCause,
       { "abandonCause", "inap.abandonCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10218,11 +10218,11 @@ void proto_register_inap(void) {
     { &hf_inap_tAbandon,
       { "tAbandon", "inap.tAbandon",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tAbandon", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_authorizeRouteFailure,
       { "authorizeRouteFailure", "inap.authorizeRouteFailure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_authorizeRouteFailure", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_authoriseRouteFailureCause,
       { "authoriseRouteFailureCause", "inap.authoriseRouteFailureCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10230,11 +10230,11 @@ void proto_register_inap(void) {
     { &hf_inap_terminationAttemptAuthorized,
       { "terminationAttemptAuthorized", "inap.terminationAttemptAuthorized",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_terminationAttemptAuthorized", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_originationAttemptDenied,
       { "originationAttemptDenied", "inap.originationAttemptDenied",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_originationAttemptDenied", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_originationDeniedCause,
       { "originationDeniedCause", "inap.originationDeniedCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10242,7 +10242,7 @@ void proto_register_inap(void) {
     { &hf_inap_terminationAttemptDenied,
       { "terminationAttemptDenied", "inap.terminationAttemptDenied",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_terminationAttemptDenied", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_terminationDeniedCause,
       { "terminationDeniedCause", "inap.terminationDeniedCause",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10250,11 +10250,11 @@ void proto_register_inap(void) {
     { &hf_inap_oModifyRequestSpecificInfo,
       { "oModifyRequestSpecificInfo", "inap.oModifyRequestSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oModifyRequestSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_oModifyResultSpecificInfo,
       { "oModifyResultSpecificInfo", "inap.oModifyResultSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oModifyResultSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_modifyResultType,
       { "modifyResultType", "inap.modifyResultType",
         FT_UINT32, BASE_DEC, VALS(inap_ModifyResultType_vals), 0,
@@ -10262,11 +10262,11 @@ void proto_register_inap(void) {
     { &hf_inap_tModifyRequestSpecificInfo,
       { "tModifyRequestSpecificInfo", "inap.tModifyRequestSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tModifyRequestSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_tModifyResultSpecificInfo,
       { "tModifyResultSpecificInfo", "inap.tModifyResultSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_tModifyResultSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_trunkGroupID,
       { "trunkGroupID", "inap.trunkGroupID",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -10314,7 +10314,7 @@ void proto_register_inap(void) {
     { &hf_inap_addressAndService,
       { "addressAndService", "inap.addressAndService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_addressAndService", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_duration,
       { "duration", "inap.duration",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -10350,7 +10350,7 @@ void proto_register_inap(void) {
     { &hf_inap_both,
       { "both", "inap.both",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_both", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_GenericNumbers_item,
       { "GenericNumber", "inap.GenericNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10398,7 +10398,7 @@ void proto_register_inap(void) {
     { &hf_inap_MidCallControlInfo_item,
       { "MidCallControlInfo item", "inap.MidCallControlInfo_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MidCallControlInfo_item", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_midCallInfoType,
       { "midCallInfoType", "inap.midCallInfoType",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -10406,7 +10406,7 @@ void proto_register_inap(void) {
     { &hf_inap_midCallReportType,
       { "midCallReportType", "inap.midCallReportType",
         FT_UINT32, BASE_DEC, VALS(inap_T_midCallReportType_vals), 0,
-        "T_midCallReportType", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_iNServiceControlCode,
       { "iNServiceControlCode", "inap.iNServiceControlCode",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10422,11 +10422,11 @@ void proto_register_inap(void) {
     { &hf_inap_messageType,
       { "messageType", "inap.messageType",
         FT_UINT32, BASE_DEC, VALS(inap_T_messageType_vals), 0,
-        "T_messageType", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_dpAssignment,
       { "dpAssignment", "inap.dpAssignment",
         FT_UINT32, BASE_DEC, VALS(inap_T_dpAssignment_vals), 0,
-        "T_dpAssignment", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_threshold,
       { "threshold", "inap.threshold",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -10566,7 +10566,7 @@ void proto_register_inap(void) {
     { &hf_inap_redirectServiceTreatmentInd,
       { "redirectServiceTreatmentInd", "inap.redirectServiceTreatmentInd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_redirectServiceTreatmentInd", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_redirectReason,
       { "redirectReason", "inap.redirectReason",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10574,7 +10574,7 @@ void proto_register_inap(void) {
     { &hf_inap_nonCUGCall,
       { "nonCUGCall", "inap.nonCUGCall",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_oneTrigger,
       { "oneTrigger", "inap.oneTrigger",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -10586,11 +10586,11 @@ void proto_register_inap(void) {
     { &hf_inap_triggerId,
       { "triggerId", "inap.triggerId",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_triggerId", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_triggerPar,
       { "triggerPar", "inap.triggerPar",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_triggerPar", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_triggerID,
       { "triggerID", "inap.triggerID",
         FT_UINT32, BASE_DEC, VALS(inap_EventTypeBCSM_vals), 0,
@@ -10810,11 +10810,11 @@ void proto_register_inap(void) {
     { &hf_inap_allRequests,
       { "allRequests", "inap.allRequests",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_callSegmentToCancel,
       { "callSegmentToCancel", "inap.callSegmentToCancel",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_callSegmentToCancel", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_allRequestsForCallSegment,
       { "allRequestsForCallSegment", "inap.allRequestsForCallSegment",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -10878,11 +10878,11 @@ void proto_register_inap(void) {
     { &hf_inap_cug_OutgoingAccess,
       { "cug-OutgoingAccess", "inap.cug_OutgoingAccess",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_resourceAddress,
       { "resourceAddress", "inap.resourceAddress",
         FT_UINT32, BASE_DEC, VALS(inap_T_resourceAddress_vals), 0,
-        "T_resourceAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_ipRoutingAddress,
       { "ipRoutingAddress", "inap.ipRoutingAddress",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10890,19 +10890,19 @@ void proto_register_inap(void) {
     { &hf_inap_ipAddressAndLegID,
       { "ipAddressAndLegID", "inap.ipAddressAndLegID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_ipAddressAndLegID", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_none,
       { "none", "inap.none",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_ipAddressAndCallSegment,
       { "ipAddressAndCallSegment", "inap.ipAddressAndCallSegment",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_ipAddressAndCallSegment", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_legorCSID,
       { "legorCSID", "inap.legorCSID",
         FT_UINT32, BASE_DEC, VALS(inap_T_legorCSID_vals), 0,
-        "T_legorCSID", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_csID,
       { "csID", "inap.csID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -10942,7 +10942,7 @@ void proto_register_inap(void) {
     { &hf_inap_partyToDisconnect,
       { "partyToDisconnect", "inap.partyToDisconnect",
         FT_UINT32, BASE_DEC, VALS(inap_T_partyToDisconnect_vals), 0,
-        "T_partyToDisconnect", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_legToBeReleased,
       { "legToBeReleased", "inap.legToBeReleased",
         FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0,
@@ -10950,7 +10950,7 @@ void proto_register_inap(void) {
     { &hf_inap_cSFailure,
       { "cSFailure", "inap.cSFailure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_cSFailure", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_reason,
       { "reason", "inap.reason",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10958,7 +10958,7 @@ void proto_register_inap(void) {
     { &hf_inap_bCSMFailure,
       { "bCSMFailure", "inap.bCSMFailure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_bCSMFailure", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_assistingSSPIPRoutingAddress,
       { "assistingSSPIPRoutingAddress", "inap.assistingSSPIPRoutingAddress",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10966,7 +10966,7 @@ void proto_register_inap(void) {
     { &hf_inap_partyToConnect,
       { "partyToConnect", "inap.partyToConnect",
         FT_UINT32, BASE_DEC, VALS(inap_T_partyToConnect_vals), 0,
-        "T_partyToConnect", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_eventSpecificInformationCharging,
       { "eventSpecificInformationCharging", "inap.eventSpecificInformationCharging",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -10990,7 +10990,7 @@ void proto_register_inap(void) {
     { &hf_inap_empty,
       { "empty", "inap.empty",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_highLayerCompatibility,
       { "highLayerCompatibility", "inap.highLayerCompatibility",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -11046,7 +11046,7 @@ void proto_register_inap(void) {
     { &hf_inap_triggerDataIdentifier,
       { "triggerDataIdentifier", "inap.triggerDataIdentifier",
         FT_UINT32, BASE_DEC, VALS(inap_T_triggerDataIdentifier_vals), 0,
-        "T_triggerDataIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_profileAndDP,
       { "profileAndDP", "inap.profileAndDP",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11054,11 +11054,11 @@ void proto_register_inap(void) {
     { &hf_inap_oneTriggerResult,
       { "oneTriggerResult", "inap.oneTriggerResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oneTriggerResult", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_severalTriggerResult,
       { "severalTriggerResult", "inap.severalTriggerResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_severalTriggerResult", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_results,
       { "results", "inap.results",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11074,7 +11074,7 @@ void proto_register_inap(void) {
     { &hf_inap_mergeSignallingPaths,
       { "mergeSignallingPaths", "inap.mergeSignallingPaths",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_routeCounters,
       { "routeCounters", "inap.routeCounters",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11094,19 +11094,19 @@ void proto_register_inap(void) {
     { &hf_inap_callSegments,
       { "callSegments", "inap.callSegments",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_callSegments", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_callSegments_item,
       { "callSegments item", "inap.callSegments_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_callSegments_item", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_legs,
       { "legs", "inap.legs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_legs", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_legs_item,
       { "legs item", "inap.legs_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_legs_item", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_sourceLeg,
       { "sourceLeg", "inap.sourceLeg",
         FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0,
@@ -11122,11 +11122,11 @@ void proto_register_inap(void) {
     { &hf_inap_detachSignallingPath,
       { "detachSignallingPath", "inap.detachSignallingPath",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_exportSignallingPath,
       { "exportSignallingPath", "inap.exportSignallingPath",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_featureRequestIndicator,
       { "featureRequestIndicator", "inap.featureRequestIndicator",
         FT_UINT32, BASE_DEC, VALS(inap_FeatureRequestIndicator_vals), 0,
@@ -11146,7 +11146,7 @@ void proto_register_inap(void) {
     { &hf_inap_callSegmentToRelease,
       { "callSegmentToRelease", "inap.callSegmentToRelease",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_callSegmentToRelease", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_callSegment,
       { "callSegment", "inap.callSegment",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11158,7 +11158,7 @@ void proto_register_inap(void) {
     { &hf_inap_allCallSegments,
       { "allCallSegments", "inap.allCallSegments",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_allCallSegments", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_timeToRelease,
       { "timeToRelease", "inap.timeToRelease",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11342,7 +11342,7 @@ void proto_register_inap(void) {
     { &hf_inap_controlDigits,
       { "controlDigits", "inap.controlDigits",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_controlDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_endOfRecordingDigit,
       { "endOfRecordingDigit", "inap.endOfRecordingDigit",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -11378,7 +11378,7 @@ void proto_register_inap(void) {
     { &hf_inap_text,
       { "text", "inap.text",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_text", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_messageContent,
       { "messageContent", "inap.messageContent",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -11398,7 +11398,7 @@ void proto_register_inap(void) {
     { &hf_inap_variableMessage,
       { "variableMessage", "inap.variableMessage",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_variableMessage", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_variableParts,
       { "variableParts", "inap.variableParts",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11418,7 +11418,7 @@ void proto_register_inap(void) {
     { &hf_inap_iPAddressAndresource,
       { "iPAddressAndresource", "inap.iPAddressAndresource",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_iPAddressAndresource", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_toneID,
       { "toneID", "inap.toneID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11458,7 +11458,7 @@ void proto_register_inap(void) {
     { &hf_inap_connectedParty,
       { "connectedParty", "inap.connectedParty",
         FT_UINT32, BASE_DEC, VALS(inap_T_connectedParty_vals), 0,
-        "T_connectedParty", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_collectedInfo,
       { "collectedInfo", "inap.collectedInfo",
         FT_UINT32, BASE_DEC, VALS(inap_CollectedInfo_vals), 0,
@@ -11510,11 +11510,11 @@ void proto_register_inap(void) {
     { &hf_inap_uIScriptSpecificInfo,
       { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_uIScriptSpecificInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_uIScriptResult,
       { "uIScriptResult", "inap.uIScriptResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_uIScriptResult", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_uIScriptSpecificInfo_01,
       { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11530,7 +11530,7 @@ void proto_register_inap(void) {
     { &hf_inap_problem,
       { "problem", "inap.problem",
         FT_UINT32, BASE_DEC, VALS(inap_T_problem_vals), 0,
-        "T_problem", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_operation,
       { "operation", "inap.operation",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -11538,7 +11538,7 @@ void proto_register_inap(void) {
     { &hf_inap_reason_01,
       { "reason", "inap.reason",
         FT_UINT32, BASE_DEC, VALS(inap_T_reason_vals), 0,
-        "T_reason", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_securityParameters,
       { "securityParameters", "inap.securityParameters",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11550,7 +11550,7 @@ void proto_register_inap(void) {
     { &hf_inap_local_01,
       { "local", "inap.local",
         FT_INT32, BASE_DEC, NULL, 0,
-        "T_local", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_invoke,
       { "invoke", "inap.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11574,7 +11574,7 @@ void proto_register_inap(void) {
     { &hf_inap_linkedId,
       { "linkedId", "inap.linkedId",
         FT_UINT32, BASE_DEC, VALS(inap_T_linkedId_vals), 0,
-        "T_linkedId", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_linkedIdPresent,
       { "present", "inap.present",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -11582,7 +11582,7 @@ void proto_register_inap(void) {
     { &hf_inap_absent,
       { "absent", "inap.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_opcode,
       { "opcode", "inap.opcode",
         FT_UINT32, BASE_DEC, VALS(inap_Code_vals), 0,
@@ -11590,11 +11590,11 @@ void proto_register_inap(void) {
     { &hf_inap_argument,
       { "argument", "inap.argument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_argument", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_result,
       { "result", "inap.result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_result", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_resultArgument,
       { "result", "inap.result",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11606,7 +11606,7 @@ void proto_register_inap(void) {
     { &hf_inap_parameter,
       { "parameter", "inap.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_inap_problem_01,
       { "problem", "inap.problem",
         FT_UINT32, BASE_DEC, VALS(inap_T_problem_01_vals), 0,