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


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

1 files changed, 94 insertions, 94 deletions

diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 90d9a68c59..fe85c9efad 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -12542,13 +12542,13 @@ void proto_register_qsig(void) {
   static hf_register_info hf[] = {
     { &hf_qsig_operation, { "Operation", "qsig.operation",
                            FT_UINT8, BASE_DEC, VALS(qsig_str_operation), 0x0,
-                           "Operation", HFILL }},
+                           NULL, HFILL }},
     { &hf_qsig_service,   { "Service", "qsig.service",
                            FT_UINT8, BASE_DEC, VALS(qsig_str_service), 0x0,
                            "Supplementary Service", HFILL }},
     { &hf_qsig_error,     { "Error", "qsig.error",
                            FT_UINT8, BASE_DEC, VALS(qsig_str_error), 0x0,
-                           "Error", HFILL }},
+                           NULL, HFILL }},
     { &hf_qsig_ie_type, { "Type", "qsig.ie.type",
                           FT_UINT8, BASE_HEX, NULL, 0x0,
                           "Information Element Type", HFILL }},
@@ -12562,14 +12562,14 @@ void proto_register_qsig(void) {
                           FT_UINT8, BASE_DEC, NULL, 0x0,
                           "Information Element Length", HFILL }},
     { &hf_qsig_ie_data, { "Data", "qsig.ie.data",
-                          FT_BYTES, BASE_HEX, NULL, 0x0,
-                          "Data", HFILL }},
+                          FT_BYTES, BASE_NONE, NULL, 0x0,
+                          NULL, HFILL }},
     { &hf_qsig_tc,      { "Transit count", "qsig.tc",
                           FT_UINT8, BASE_DEC, NULL, 0x1F,
-                          "Transit count", HFILL }},
+                          NULL, HFILL }},
     { &hf_qsig_pc,      { "Party category", "qsig.pc",
                           FT_UINT8, BASE_HEX, VALS(qsig_str_pc), 0x07,
-                          "Party category", HFILL }},
+                          NULL, HFILL }},
 
 /*--- Included file: packet-qsig-hfarr.c ---*/
 #line 1 "packet-qsig-hfarr.c"
@@ -12682,15 +12682,15 @@ void proto_register_qsig(void) {
         "qsig.UserSpecifiedSubaddress", HFILL }},
     { &hf_qsig_nSAPSubaddress,
       { "nSAPSubaddress", "qsig.nSAPSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.NSAPSubaddress", HFILL }},
     { &hf_qsig_subaddressInformation,
       { "subaddressInformation", "qsig.subaddressInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.SubaddressInformation", HFILL }},
     { &hf_qsig_oddCountIndicator,
       { "oddCountIndicator", "qsig.oddCountIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig.BOOLEAN", HFILL }},
 
 /* --- Module Name-Operations-asn1-97 --- --- ---                             */
@@ -12908,7 +12908,7 @@ void proto_register_qsig(void) {
         "qsig_cf.INTEGER_1_15", HFILL }},
     { &hf_qsig_cf_pSS1InfoElement,
       { "pSS1InfoElement", "qsig.cf.pSS1InfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_cf_lastRerouteingNr,
       { "lastRerouteingNr", "qsig.cf.lastRerouteingNr",
@@ -12972,7 +12972,7 @@ void proto_register_qsig(void) {
         "qsig_cf.DLI2Extension", HFILL }},
     { &hf_qsig_cf_presentationAllowedIndicator,
       { "presentationAllowedIndicator", "qsig.cf.presentationAllowedIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig.PresentationAllowedIndicator", HFILL }},
     { &hf_qsig_cf_redirectionName,
       { "redirectionName", "qsig.cf.redirectionName",
@@ -12988,7 +12988,7 @@ void proto_register_qsig(void) {
         "qsig_cf.IntResult", HFILL }},
     { &hf_qsig_cf_remoteEnabled,
       { "remoteEnabled", "qsig.cf.remoteEnabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cf.BOOLEAN", HFILL }},
     { &hf_qsig_cf_extensionIR,
       { "extension", "qsig.cf.extension",
@@ -13142,7 +13142,7 @@ void proto_register_qsig(void) {
         "qsig.PresentedAddressScreened", HFILL }},
     { &hf_qsig_ct_basicCallInfoElements,
       { "basicCallInfoElements", "qsig.ct.basicCallInfoElements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_ct_connectedName,
       { "connectedName", "qsig.ct.connectedName",
@@ -13217,7 +13217,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_cc_service,
       { "service", "qsig.cc.service",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_cc_subaddrA,
       { "subaddrA", "qsig.cc.subaddrA",
@@ -13229,11 +13229,11 @@ void proto_register_qsig(void) {
         "qsig.PartySubaddress", HFILL }},
     { &hf_qsig_cc_can_retain_service,
       { "can-retain-service", "qsig.cc.can_retain_service",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_retain_sig_connection,
       { "retain-sig-connection", "qsig.cc.retain_sig_connection",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_extension,
       { "extension", "qsig.cc.extension",
@@ -13241,11 +13241,11 @@ void proto_register_qsig(void) {
         "qsig_cc.CcExtension", HFILL }},
     { &hf_qsig_cc_no_path_reservation,
       { "no-path-reservation", "qsig.cc.no_path_reservation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_retain_service,
       { "retain-service", "qsig.cc.retain_service",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_fullArg,
       { "fullArg", "qsig.cc.fullArg",
@@ -13300,7 +13300,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_co_serviceList,
       { "serviceList", "qsig.co.serviceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_co.ServiceList", HFILL }},
     { &hf_qsig_co_extendedServiceList,
       { "extendedServiceList", "qsig.co.extendedServiceList",
@@ -13329,7 +13329,7 @@ void proto_register_qsig(void) {
     { &hf_qsig_co_ServiceList_callOffer,
       { "callOffer", "qsig.co.callOffer",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module Do-Not-Disturb-Operations-asn1-97 --- --- ---                   */
 
@@ -13451,7 +13451,7 @@ void proto_register_qsig(void) {
         "qsig_dnd.DNDOargumentExtension", HFILL }},
     { &hf_qsig_dnd_serviceList,
       { "serviceList", "qsig.dnd.serviceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_dnd.ServiceList", HFILL }},
     { &hf_qsig_dnd_extendedServiceList,
       { "extendedServiceList", "qsig.dnd.extendedServiceList",
@@ -13464,15 +13464,15 @@ void proto_register_qsig(void) {
     { &hf_qsig_dnd_ServiceList_dndo_low,
       { "dndo-low", "qsig.dnd.dndo-low",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_medium,
       { "dndo-medium", "qsig.dnd.dndo-medium",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_high,
       { "dndo-high", "qsig.dnd.dndo-high",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module Call-Intrusion-Operations-asn1-97 --- --- ---                   */
 
@@ -13510,7 +13510,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_ci_serviceList,
       { "serviceList", "qsig.ci.serviceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_ci.ServiceList", HFILL }},
     { &hf_qsig_ci_extendedServiceList,
       { "extendedServiceList", "qsig.ci.extendedServiceList",
@@ -13563,15 +13563,15 @@ void proto_register_qsig(void) {
     { &hf_qsig_ci_ServiceList_ci_low,
       { "ci-low", "qsig.ci.ci-low",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_medium,
       { "ci-medium", "qsig.ci.ci-medium",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_high,
       { "ci-high", "qsig.ci.ci-high",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module SS-AOC-Operations-asn1-97 --- --- ---                           */
 
@@ -13927,7 +13927,7 @@ void proto_register_qsig(void) {
         "qsig_sync.ArgExtension", HFILL }},
     { &hf_qsig_sync_response,
       { "response", "qsig.sync.response",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sync.BOOLEAN", HFILL }},
     { &hf_qsig_sync_stateinfo,
       { "stateinfo", "qsig.sync.stateinfo",
@@ -14025,7 +14025,7 @@ void proto_register_qsig(void) {
         "qsig_cmn.CmnArg", HFILL }},
     { &hf_qsig_cmn_featureIdentifier,
       { "featureIdentifier", "qsig.cmn.featureIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_cmn.FeatureIdList", HFILL }},
     { &hf_qsig_cmn_ssDNDOprotectionLevel,
       { "ssDNDOprotectionLevel", "qsig.cmn.ssDNDOprotectionLevel",
@@ -14078,75 +14078,75 @@ void proto_register_qsig(void) {
     { &hf_qsig_cmn_FeatureIdList_reserved,
       { "reserved", "qsig.cmn.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCFreRoutingSupported,
       { "ssCFreRoutingSupported", "qsig.cmn.ssCFreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCTreRoutingSupported,
       { "ssCTreRoutingSupported", "qsig.cmn.ssCTreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCCBSpossible,
       { "ssCCBSpossible", "qsig.cmn.ssCCBSpossible",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCCNRpossible,
       { "ssCCNRpossible", "qsig.cmn.ssCCNRpossible",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCOsupported,
       { "ssCOsupported", "qsig.cmn.ssCOsupported",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIforcedRelease,
       { "ssCIforcedRelease", "qsig.cmn.ssCIforcedRelease",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIisolation,
       { "ssCIisolation", "qsig.cmn.ssCIisolation",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIwaitOnBusy,
       { "ssCIwaitOnBusy", "qsig.cmn.ssCIwaitOnBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportChargeRateProvAtGatewPinx,
       { "ssAOCsupportChargeRateProvAtGatewPinx", "qsig.cmn.ssAOCsupportChargeRateProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportInterimChargeProvAtGatewPinx,
       { "ssAOCsupportInterimChargeProvAtGatewPinx", "qsig.cmn.ssAOCsupportInterimChargeProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportFinalChargeProvAtGatewPinx,
       { "ssAOCsupportFinalChargeProvAtGatewPinx", "qsig.cmn.ssAOCsupportFinalChargeProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfPRsupportedAtCooperatingPinx,
       { "anfPRsupportedAtCooperatingPinx", "qsig.cmn.anfPRsupportedAtCooperatingPinx",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptImmediate,
       { "anfCINTcanInterceptImmediate", "qsig.cmn.anfCINTcanInterceptImmediate",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptDelayed,
       { "anfCINTcanInterceptDelayed", "qsig.cmn.anfCINTcanInterceptDelayed",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfWTMIreRoutingSupported,
       { "anfWTMIreRoutingSupported", "qsig.cmn.anfWTMIreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfPUMIreRoutingSupported,
       { "anfPUMIreRoutingSupported", "qsig.cmn.anfPUMIreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssSSCTreRoutingSupported,
       { "ssSSCTreRoutingSupported", "qsig.cmn.ssSSCTreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module Call-Interruption-Operations-asn1-97 --- --- ---                */
 
@@ -14231,7 +14231,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_pumr_alternativeId,
       { "alternativeId", "qsig.pumr.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumr.AlternativeId", HFILL }},
     { &hf_qsig_pumr_basicService,
       { "basicService", "qsig.pumr.basicService",
@@ -14259,11 +14259,11 @@ void proto_register_qsig(void) {
         "qsig_pumr.T_userPin", HFILL }},
     { &hf_qsig_pumr_pumUserPin,
       { "pumUserPin", "qsig.pumr.pumUserPin",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumr.UserPin", HFILL }},
     { &hf_qsig_pumr_activatingUserPin,
       { "activatingUserPin", "qsig.pumr.activatingUserPin",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumr.UserPin", HFILL }},
     { &hf_qsig_pumr_argExtension,
       { "argExtension", "qsig.pumr.argExtension",
@@ -14303,7 +14303,7 @@ void proto_register_qsig(void) {
         "qsig_pumr.IpumUserId", HFILL }},
     { &hf_qsig_pumr_homeInfoOnly,
       { "homeInfoOnly", "qsig.pumr.homeInfoOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_pumr.BOOLEAN", HFILL }},
     { &hf_qsig_pumr_userPin_02,
       { "userPin", "qsig.pumr.userPin",
@@ -14362,7 +14362,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_pumch_qSIGInfoElement,
       { "qSIGInfoElement", "qsig.pumch.qSIGInfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_pumch_argExtension,
       { "argExtension", "qsig.pumch.argExtension",
@@ -14430,7 +14430,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_pumch_alternativeId,
       { "alternativeId", "qsig.pumch.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumch.AlternativeId", HFILL }},
     { &hf_qsig_pumch_both,
       { "both", "qsig.pumch.both",
@@ -14513,7 +14513,7 @@ void proto_register_qsig(void) {
         "qsig.PresentedAddressScreened", HFILL }},
     { &hf_qsig_ssct_awaitConnect,
       { "awaitConnect", "qsig.ssct.awaitConnect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_ssct.AwaitConnect", HFILL }},
     { &hf_qsig_ssct_transferredName,
       { "transferredName", "qsig.ssct.transferredName",
@@ -14628,7 +14628,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_wtmlr_alternativeId,
       { "alternativeId", "qsig.wtmlr.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmlr.AlternativeId", HFILL }},
     { &hf_qsig_wtmlr_resExtension,
       { "resExtension", "qsig.wtmlr.resExtension",
@@ -14683,7 +14683,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_wtmch_qSIGInfoElement,
       { "qSIGInfoElement", "qsig.wtmch.qSIGInfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_wtmch_argExtension,
       { "argExtension", "qsig.wtmch.argExtension",
@@ -14751,7 +14751,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_wtmch_alternativeId,
       { "alternativeId", "qsig.wtmch.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmch.AlternativeId", HFILL }},
     { &hf_qsig_wtmch_both,
       { "both", "qsig.wtmch.both",
@@ -14838,7 +14838,7 @@ void proto_register_qsig(void) {
         "qsig_wtmau.CanCompute", HFILL }},
     { &hf_qsig_wtmau_authChallenge,
       { "authChallenge", "qsig.wtmau.authChallenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthChallenge", HFILL }},
     { &hf_qsig_wtmau_wtatParamInfo,
       { "wtatParamInfo", "qsig.wtmau.wtatParamInfo",
@@ -14854,7 +14854,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_wtmau_alternativeId,
       { "alternativeId", "qsig.wtmau.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AlternativeId", HFILL }},
     { &hf_qsig_wtmau_wtanParamInfo,
       { "wtanParamInfo", "qsig.wtmau.wtanParamInfo",
@@ -14870,7 +14870,7 @@ void proto_register_qsig(void) {
         "qsig_wtmau.AuthSessionKeyInfo", HFILL }},
     { &hf_qsig_wtmau_authKey,
       { "authKey", "qsig.wtmau.authKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthKey", HFILL }},
     { &hf_qsig_wtmau_challLen,
       { "challLen", "qsig.wtmau.challLen",
@@ -14882,11 +14882,11 @@ void proto_register_qsig(void) {
         "qsig_wtmau.CalcWtanInfo", HFILL }},
     { &hf_qsig_wtmau_authSessionKey,
       { "authSessionKey", "qsig.wtmau.authSessionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthSessionKey", HFILL }},
     { &hf_qsig_wtmau_calculationParam,
       { "calculationParam", "qsig.wtmau.calculationParam",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.CalculationParam", HFILL }},
     { &hf_qsig_wtmau_CalcWtatInfo_item,
       { "CalcWtatInfoUnit", "qsig.wtmau.CalcWtatInfoUnit",
@@ -14894,11 +14894,11 @@ void proto_register_qsig(void) {
         "qsig_wtmau.CalcWtatInfoUnit", HFILL }},
     { &hf_qsig_wtmau_authResponse,
       { "authResponse", "qsig.wtmau.authResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthResponse", HFILL }},
     { &hf_qsig_wtmau_derivedCipherKey,
       { "derivedCipherKey", "qsig.wtmau.derivedCipherKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.DerivedCipherKey", HFILL }},
     { &hf_qsig_wtmau_extension,
       { "extension", "qsig.wtmau.extension",
@@ -14945,15 +14945,15 @@ void proto_register_qsig(void) {
         "qsig_sd.SDExtension", HFILL }},
     { &hf_qsig_sd_displayStringNormal,
       { "displayStringNormal", "qsig.sd.displayStringNormal",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sd.BMPStringNormal", HFILL }},
     { &hf_qsig_sd_displayStringExtended,
       { "displayStringExtended", "qsig.sd.displayStringExtended",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sd.BMPStringExtended", HFILL }},
     { &hf_qsig_sd_keypadString,
       { "keypadString", "qsig.sd.keypadString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sd.BMPStringNormal", HFILL }},
     { &hf_qsig_sd_extension,
       { "extension", "qsig.sd.extension",
@@ -15004,11 +15004,11 @@ void proto_register_qsig(void) {
         "qsig_cidl.T_linkageID", HFILL }},
     { &hf_qsig_cidl_subDomainID,
       { "subDomainID", "qsig.cidl.subDomainID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_cidl.SubDomainID", HFILL }},
     { &hf_qsig_cidl_globallyUniqueID,
       { "globallyUniqueID", "qsig.cidl.globallyUniqueID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_cidl.GloballyUniqueID", HFILL }},
     { &hf_qsig_cidl_timeStamp,
       { "timeStamp", "qsig.cidl.timeStamp",
@@ -15151,15 +15151,15 @@ void proto_register_qsig(void) {
         "qsig_sms.Status", HFILL }},
     { &hf_qsig_sms_priority,
       { "priority", "qsig.sms.priority",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_moreMessagesToSend,
       { "moreMessagesToSend", "qsig.sms.moreMessagesToSend",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_statusReportQualifier,
       { "statusReportQualifier", "qsig.sms.statusReportQualifier",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_smsStatusReportResponseChoice,
       { "smsStatusReportResponseChoice", "qsig.sms.smsStatusReportResponseChoice",
@@ -15175,11 +15175,11 @@ void proto_register_qsig(void) {
         "qsig_sms.CommandType", HFILL }},
     { &hf_qsig_sms_commandData,
       { "commandData", "qsig.sms.commandData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.CommandData", HFILL }},
     { &hf_qsig_sms_statusReportRequest,
       { "statusReportRequest", "qsig.sms.statusReportRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_null,
       { "null", "qsig.sms.null",
@@ -15191,15 +15191,15 @@ void proto_register_qsig(void) {
         "qsig_sms.ValidityPeriod", HFILL }},
     { &hf_qsig_sms_replyPath,
       { "replyPath", "qsig.sms.replyPath",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_rejectDuplicates,
       { "rejectDuplicates", "qsig.sms.rejectDuplicates",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_statusReportIndication,
       { "statusReportIndication", "qsig.sms.statusReportIndication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_resChoiceSeq,
       { "resChoiceSeq", "qsig.sms.resChoiceSeq",
@@ -15231,7 +15231,7 @@ void proto_register_qsig(void) {
         "qsig_sms.ValidityPeriodEnh", HFILL }},
     { &hf_qsig_sms_singleShotSM,
       { "singleShotSM", "qsig.sms.singleShotSM",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_enhancedVP,
       { "enhancedVP", "qsig.sms.enhancedVP",
@@ -15243,7 +15243,7 @@ void proto_register_qsig(void) {
         "qsig_sms.INTEGER_0_255", HFILL }},
     { &hf_qsig_sms_validityPeriodSemi,
       { "validityPeriodSemi", "qsig.sms.validityPeriodSemi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.ValidityPeriodSemi", HFILL }},
     { &hf_qsig_sms_userDataHeader,
       { "userDataHeader", "qsig.sms.userDataHeader",
@@ -15255,7 +15255,7 @@ void proto_register_qsig(void) {
         "qsig_sms.INTEGER_0_3", HFILL }},
     { &hf_qsig_sms_compressed,
       { "compressed", "qsig.sms.compressed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_shortMessageText,
       { "shortMessageText", "qsig.sms.shortMessageText",
@@ -15267,7 +15267,7 @@ void proto_register_qsig(void) {
         "qsig_sms.ShortMessageTextType", HFILL }},
     { &hf_qsig_sms_shortMessageTextData,
       { "shortMessageTextData", "qsig.sms.shortMessageTextData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.ShortMessageTextData", HFILL }},
     { &hf_qsig_sms_UserDataHeader_item,
       { "UserDataHeaderChoice", "qsig.sms.UserDataHeaderChoice",
@@ -15275,7 +15275,7 @@ void proto_register_qsig(void) {
         "qsig_sms.UserDataHeaderChoice", HFILL }},
     { &hf_qsig_sms_smscControlParameterHeader,
       { "smscControlParameterHeader", "qsig.sms.smscControlParameterHeader",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.SmscControlParameterHeader", HFILL }},
     { &hf_qsig_sms_concatenated8BitSMHeader,
       { "concatenated8BitSMHeader", "qsig.sms.concatenated8BitSMHeader",
@@ -15299,7 +15299,7 @@ void proto_register_qsig(void) {
         "qsig_sms.DataHeaderSourceIndicator", HFILL }},
     { &hf_qsig_sms_wirelessControlHeader,
       { "wirelessControlHeader", "qsig.sms.wirelessControlHeader",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.WirelessControlHeader", HFILL }},
     { &hf_qsig_sms_genericUserValue,
       { "genericUserValue", "qsig.sms.genericUserValue",
@@ -15351,7 +15351,7 @@ void proto_register_qsig(void) {
         "qsig_sms.INTEGER_0_255", HFILL }},
     { &hf_qsig_sms_genericUserData,
       { "genericUserData", "qsig.sms.genericUserData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.OCTET_STRING", HFILL }},
     { &hf_qsig_sms_failureCause,
       { "failureCause", "qsig.sms.failureCause",
@@ -15359,32 +15359,32 @@ void proto_register_qsig(void) {
         "qsig_sms.FailureCause", HFILL }},
     { &hf_qsig_sms_scAddressSaved,
       { "scAddressSaved", "qsig.sms.scAddressSaved",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted,
       { "sRforTransactionCompleted", "qsig.sms.sRforTransactionCompleted",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError,
       { "sRforPermanentError", "qsig.sms.sRforPermanentError",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying,
       { "sRforTempErrorSCnotTrying", "qsig.sms.sRforTempErrorSCnotTrying",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying,
       { "sRforTempErrorSCstillTrying", "qsig.sms.sRforTempErrorSCstillTrying",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM,
       { "cancelSRRforConcatenatedSM", "qsig.sms.cancelSRRforConcatenatedSM",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR,
       { "includeOrigUDHintoSR", "qsig.sms.includeOrigUDHintoSR",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module SS-MCR-Operations-asn97 --- --- ---                             */
 
@@ -15414,7 +15414,7 @@ void proto_register_qsig(void) {
         "qsig_mcr.CallType", HFILL }},
     { &hf_qsig_mcr_retainOrigCall,
       { "retainOrigCall", "qsig.mcr.retainOrigCall",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_mcr.BOOLEAN", HFILL }},
     { &hf_qsig_mcr_destinationAddress,
       { "destinationAddress", "qsig.mcr.destinationAddress",
@@ -15641,7 +15641,7 @@ void proto_register_qsig(void) {
         "qsig_mcm.UpdateInfo", HFILL }},
     { &hf_qsig_mcm_moreInfoFollows,
       { "moreInfoFollows", "qsig.mcm.moreInfoFollows",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_mcm.BOOLEAN", HFILL }},
     { &hf_qsig_mcm_argumentExtMCMUpdArg,
       { "argumentExt", "qsig.mcm.argumentExt",