epan: Remove STR_ASCII and STR_UNICODE

These display bases work to replace unprintable characters so the
name is a misnomer. In addition they are the same option and this
display behaviour is not something that is configurable.

This does not affect encodings because all our internal text strings
need to be valid UTF-8 and the source encoding is specified using
ENC_*.

Remove the assertion for valid UTF-8 in proto.c because
tvb_get_*_string() must return a valid UTF-8 string, always, and we
don't need to assert that, it is expensive.

doc/README.dissector

@@ -176,7 +176,7 @@ FIELDDISPLAY    --For FT_UINT{8,16,24,32,40,48,56,64} and
 
                 --For FT_STRING, FT_STRINGZ and FT_UINT_STRING:
 
-                  STR_ASCII or STR_UNICODE
+                  (must be) BASE_NONE
 
                 --For FT_BYTES and FT_UINT_BYTES:
 

epan/dissectors/asn1/credssp/credssp.cnf

@@ -87,7 +87,7 @@ TSRequest
 
 
 #.TYPE_ATTR
-TSRemoteGuardPackageCred/packageName TYPE = FT_STRING DISPLAY = STR_UNICODE STRINGS = NULL
+TSRemoteGuardPackageCred/packageName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
 
 #.FN_BODY TSRemoteGuardPackageCred/packageName VAL_PTR = &pname
 	tvbuff_t *pname = NULL;

epan/dissectors/asn1/gsm_map/gsm_map.cnf

@@ -1205,7 +1205,7 @@ Ext-TeleserviceCode TYPE = FT_UINT8  DISPLAY = BASE_DEC  STRINGS = VALS(Teleserv
 Ext-BearerServiceCode  TYPE = FT_UINT8  DISPLAY = BASE_DEC  STRINGS = VALS(Bearerservice_vals)
 ChargingCharacteristics  TYPE = FT_UINT16  DISPLAY = BASE_DEC  BITMASK = 0x0f00 STRINGS = VALS(chargingcharacteristics_values)
 RoutingInfo TYPE = FT_UINT32  DISPLAY = BASE_DEC  STRINGS = VALS(gsm_map_ch_RoutingInfo_vals)
-DiameterIdentity TYPE = FT_STRING  DISPLAY = STR_ASCII
+DiameterIdentity TYPE = FT_STRING  DISPLAY = BASE_NONE
 
 #----------------------------------------------------------------------------------------
 #.FIELD_ATTR

epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c

@@ -3260,7 +3260,7 @@ void proto_register_gsm_map(void) {
           "Service Area Code", HFILL }},
       { &hf_gsm_map_ussd_string,
         { "USSD String", "gsm_map.ussd_string",
-          FT_STRING, STR_UNICODE, NULL, 0,
+          FT_STRING, BASE_NONE, NULL, 0,
           NULL, HFILL }},
     { &hf_gsm_map_spare_bits,
         { "Spare bit(s)", "gsm_map.spare_bits",

epan/dissectors/asn1/ldap/ldap.cnf

@@ -25,7 +25,7 @@ BindResponse/_untag/matchedDN bindResponse_matchedDN
 IntermediateResponse/_untag/responseValue intermediateResponse_responseValue
 
 #.TYPE_ATTR
-LDAPString TYPE = FT_STRING  DISPLAY = STR_UNICODE  STRINGS = NULL
+LDAPString TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL
 LDAPURL TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL
 LDAPOID  TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL
 Mechanism  TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL

epan/dissectors/asn1/lpp/lpp.cnf

@@ -1773,7 +1773,7 @@ WLAN-MeasurementElement-r13/rssi-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&
 WLAN-AP-Identifier-r13/bssid-r13 TYPE=FT_ETHER
 
 #.TYPE_ATTR
-WLAN-AP-Identifier-r13/ssid-r13 TYPE=FT_STRING DISPLAY=STR_ASCII
+WLAN-AP-Identifier-r13/ssid-r13 TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY WLAN-AP-Identifier-r13/ssid-r13 VAL_PTR=&ssid_tvb HF_INDEX=-1
   tvbuff_t *ssid_tvb = NULL;

epan/dissectors/asn1/lte-rrc/lte-rrc.cnf

@@ -1502,7 +1502,7 @@ LogMeasResultBT-r15/rssi-BT-r15 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units
 CarrierFreqUTRA-FDD-Ext-r12/multiBandInfoList-r12 FreqBandIndicator_UTRA_FDD_r12
 
 #.TYPE_ATTR
-SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=STR_UNICODE
+SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY SystemInformationBlockType9/hnb-Name VAL_PTR=&hnb_name_tvb HF_INDEX=-1
   tvbuff_t *hnb_name_tvb = NULL;
@@ -1738,7 +1738,7 @@ SystemInformationBlockType16-r11/timeInfo-r11/localTimeOffset-r11 DISPLAY=BASE_C
 SystemInformationBlockType26-r15/threshS-RSSI-CBR-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_threshS_RSSI_CBR_r14_fmt)
 
 #.TYPE_ATTR
-WLAN-Identifiers-r12/ssid-r12 TYPE=FT_STRING DISPLAY=STR_ASCII
+WLAN-Identifiers-r12/ssid-r12 TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY WLAN-Identifiers-r12/ssid-r12 VAL_PTR=&ssid_tvb HF_INDEX=-1
   tvbuff_t *ssid_tvb = NULL;

epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c

@@ -4082,7 +4082,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
     { &hf_lte_rrc_warningMessageSegment_decoded_page,
       { "Decoded Page", "lte-rrc.warningMessageSegment.decoded_page",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1,
       { "Bit 1", "lte-rrc.interBandTDD_CA_WithDifferentConfig.bit1",

epan/dissectors/asn1/ngap/ngap.cnf

@@ -975,7 +975,7 @@ VolumeTimedReport-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u
 VolumeTimedReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets
 
 #.TYPE_ATTR
-BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
+BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY BluetoothName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s
@@ -1144,7 +1144,7 @@ Threshold-RSRQ DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ngap_Threshold_RSRQ_fmt)
 Threshold-SINR DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ngap_Threshold_SINR_fmt)
 
 #.TYPE_ATTR
-WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE
+WLANName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY WLANName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s

epan/dissectors/asn1/ngap/packet-ngap-template.c

@@ -1089,7 +1089,7 @@ void proto_register_ngap(void) {
         NULL, HFILL }},
     { &hf_ngap_WarningMessageContents_decoded_page,
       { "Decoded Page", "ngap.WarningMessageContents.decoded_page",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ngap_NGRANTraceID_TraceID,
       { "TraceID", "ngap.NGRANTraceID.TraceID",

epan/dissectors/asn1/nr-rrc/nr-rrc.cnf

@@ -1671,7 +1671,7 @@ T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
 EUTRA-NS-PmaxValue/additionalPmax DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
 
 #.TYPE_ATTR
-WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=STR_ASCII
+WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY WLAN-Identifiers-r16/ssid-r16 VAL_PTR=&ssid_tvb HF_INDEX=-1
   tvbuff_t *ssid_tvb = NULL;

epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c

@@ -824,7 +824,7 @@ proto_register_nr_rrc(void) {
         NULL, HFILL }},
     { &hf_nr_rrc_warningMessageSegment_decoded_page,
       { "Decoded Page", "nr-rrc.warningMessageSegment.decoded_page",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nr_rrc_sib7_fragments,
       { "Fragments", "nr-rrc.warningMessageSegment.fragments",

epan/dissectors/asn1/p1/p1.cnf

@@ -1271,21 +1271,21 @@ MessageToken						B	"2.6.1.7.36"	"id-hat-forwarded-token"
 	actx->subtree.tree = NULL;
 
 #.TYPE_ATTR
-RecipientNumberForAdvice DISPLAY = STR_UNICODE
+RecipientNumberForAdvice DISPLAY = BASE_NONE
-TeletexCommonName DISPLAY = STR_UNICODE
+TeletexCommonName DISPLAY = BASE_NONE
-TeletexOrganizationName DISPLAY = STR_UNICODE
+TeletexOrganizationName DISPLAY = BASE_NONE
-TeletexPersonalName/surname DISPLAY = STR_UNICODE
+TeletexPersonalName/surname DISPLAY = BASE_NONE
-TeletexPersonalName/given-name DISPLAY = STR_UNICODE
+TeletexPersonalName/given-name DISPLAY = BASE_NONE
-TeletexPersonalName/initials DISPLAY = STR_UNICODE
+TeletexPersonalName/initials DISPLAY = BASE_NONE
-TeletexPersonalName/generation-qualifier DISPLAY = STR_UNICODE
+TeletexPersonalName/generation-qualifier DISPLAY = BASE_NONE
-TeletexOrganizationalUnitName DISPLAY = STR_UNICODE
+TeletexOrganizationalUnitName DISPLAY = BASE_NONE
-UnformattedPostalAddress/teletex-string DISPLAY = STR_UNICODE
+UnformattedPostalAddress/teletex-string DISPLAY = BASE_NONE
-PDSParameter/teletex-string DISPLAY = STR_UNICODE
+PDSParameter/teletex-string DISPLAY = BASE_NONE
-TeletexDomainDefinedAttribute/type DISPLAY = STR_UNICODE
+TeletexDomainDefinedAttribute/type DISPLAY = BASE_NONE
-TeletexDomainDefinedAttribute/value DISPLAY = STR_UNICODE
+TeletexDomainDefinedAttribute/value DISPLAY = BASE_NONE
-TeletexNonBasicParameters/graphic-character-sets DISPLAY = STR_UNICODE
+TeletexNonBasicParameters/graphic-character-sets DISPLAY = BASE_NONE
-TeletexNonBasicParameters/control-character-sets DISPLAY = STR_UNICODE
+TeletexNonBasicParameters/control-character-sets DISPLAY = BASE_NONE
-TeletexNonBasicParameters/miscellaneous-terminal-capabilities DISPLAY = STR_UNICODE
+TeletexNonBasicParameters/miscellaneous-terminal-capabilities DISPLAY = BASE_NONE
 
 #.END
 

epan/dissectors/asn1/p22/p22.cnf

@@ -265,16 +265,16 @@ IpnSecurityResponse			B	"2.6.1.18.1"	"id-sec-security-common-fields"
                                                                              tvb_reported_length(subject), ENC_T61));
 
 #.TYPE_ATTR
-SubjectField DISPLAY = STR_UNICODE
+SubjectField DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-TeletexData/_item DISPLAY = STR_UNICODE
+TeletexData/_item DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-FreeFormName DISPLAY = STR_UNICODE
+FreeFormName DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-VideotexData DISPLAY = STR_UNICODE
+VideotexData DISPLAY = BASE_NONE
 
 #.FN_PARS CharacterSetRegistration
   VAL_PTR=&crs

epan/dissectors/asn1/pkix1explicit/pkix1explicit.cnf

@@ -87,10 +87,10 @@ Extensions      B "1.2.840.113549.1.9.14" "pkcs-9-at-extensionRequest"
 		proto_tree_add_item(subtree, hf_pkix1explicit_addressFamily_safi, parameter_tvb, 0, 2, ENC_BIG_ENDIAN);
 
 #.TYPE_ATTR
-TeletexDomainDefinedAttribute/type DISPLAY = STR_UNICODE
+TeletexDomainDefinedAttribute/type DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-TeletexDomainDefinedAttribute/value DISPLAY = STR_UNICODE
+TeletexDomainDefinedAttribute/value DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
 Features/_item TYPE = FT_UINT16  STRINGS = VALS(tls_hello_extension_types) BLURB = "TLS Extension that MUST be supported by the server"

epan/dissectors/asn1/rrc/rrc.cnf

@@ -1141,7 +1141,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
 }
 
 #.TYPE_ATTR
-HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
+HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY HNBName VAL_PTR = &hnbname_tvb HF_INDEX = -1
   tvbuff_t *hnbname_tvb = NULL;

epan/dissectors/asn1/rtse/rtse.cnf

@@ -120,7 +120,7 @@ RTSE-apdus
                                                                             tvb_reported_length(string), ENC_T61));
 
 #.TYPE_ATTR
-CallingSSuserReference/t61String DISPLAY = STR_UNICODE
+CallingSSuserReference/t61String DISPLAY = BASE_NONE
 
 #.FN_PARS CommonReference
   VAL_PTR=&string
@@ -181,6 +181,6 @@ CallingSSuserReference/t61String DISPLAY = STR_UNICODE
    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, rtse_AbortReason_vals, "reason(%%d)"));
 
 #.TYPE_ATTR
-AdditionalReferenceInformation DISPLAY = STR_UNICODE
+AdditionalReferenceInformation DISPLAY = BASE_NONE
 
 #.END

epan/dissectors/asn1/s1ap/packet-s1ap-template.c

@@ -634,7 +634,7 @@ void proto_register_s1ap(void) {
         NULL, HFILL }},
     { &hf_s1ap_WarningMessageContents_decoded_page,
       { "Decoded Page", "s1ap.WarningMessageContents.decoded_page",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_measurementsToActivate_M1,
       { "M1", "s1ap.measurementsToActivate.M1",

epan/dissectors/asn1/s1ap/s1ap.cnf

@@ -1219,7 +1219,7 @@ ExtendedRepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_second
   }
 
 #.TYPE_ATTR
-LHN-ID TYPE=FT_STRING DISPLAY = STR_UNICODE
+LHN-ID TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY LHN-ID VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s
@@ -1471,7 +1471,7 @@ M-TMSI TYPE = FT_UINT32 DISPLAY = BASE_DEC_HEX
 Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Packet_LossRate_fmt)
 
 #.TYPE_ATTR
-BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
+BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY BluetoothName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s
@@ -1479,7 +1479,7 @@ BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
 #.END
 
 #.TYPE_ATTR
-WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE
+WLANName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY WLANName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s

epan/dissectors/asn1/sabp/packet-sabp-template.c

@@ -228,7 +228,7 @@ void proto_register_sabp(void) {
         NULL, HFILL }},
     { &hf_sabp_cbs_page_content,
       { "CBS Page Content", "sabp.cb_page_content",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_cb_inf_len,
       { "CBS-Message-Information-Length", "sabp.cb_inf_len",

epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c

@@ -197,7 +197,7 @@ void proto_register_sbc_ap(void) {
         NULL, HFILL }},
     { &hf_sbc_ap_Warning_Message_Contents_decoded_page,
       { "Decoded Page", "sbc-ap.WarningMessageContents.decoded_page",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 #include "packet-sbc-ap-hfarr.c"
   };

epan/dissectors/asn1/ulp/ulp.cnf

@@ -94,7 +94,7 @@ guint32 UlpMessage;
   }
 
 #.TYPE_ATTR
-Notification/requestorId TYPE=FT_STRING DISPLAY=STR_UNICODE
+Notification/requestorId TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY Notification/clientName VAL_PTR=&val_tvb HF_INDEX=-1
   tvbuff_t *val_tvb;
@@ -126,7 +126,7 @@ Notification/requestorId TYPE=FT_STRING DISPLAY=STR_UNICODE
   }
 
 #.TYPE_ATTR
-Notification/clientName TYPE=FT_STRING DISPLAY=STR_UNICODE
+Notification/clientName TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.TYPE_ATTR
 NavigationModel/gpsToe DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours
@@ -618,7 +618,7 @@ WlanAPInformation/setSignaltoNoiseDelta DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_
   }
 
 #.TYPE_ATTR
-WlanAPInformation/apSSID TYPE=FT_STRING DISPLAY=STR_ASCII
+WlanAPInformation/apSSID TYPE=FT_STRING DISPLAY=BASE_NONE
 
 #.FN_BODY WlanAPInformation/setMACAddress VAL_PTR=&val_tvb HF_INDEX=-1
   tvbuff_t *val_tvb;

epan/dissectors/asn1/x2ap/x2ap.cnf

@@ -570,7 +570,7 @@ RSRPMeasurementResult/_item/rSRPMeasured DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2a
   }
 
 #.TYPE_ATTR
-LHN-ID TYPE=FT_STRING DISPLAY = STR_UNICODE
+LHN-ID TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY LHN-ID VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s
@@ -670,7 +670,7 @@ Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(x2ap_Packet_LossRate_fmt
   proto_item_append_text(actx->created_item, " REs");
 
 #.TYPE_ATTR
-BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
+BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY BluetoothName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s
@@ -678,7 +678,7 @@ BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
 #.END
 
 #.TYPE_ATTR
-WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE
+WLANName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY WLANName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s

epan/dissectors/asn1/x509sat/x509sat.cnf

@@ -405,16 +405,16 @@ XDayOf/fifth				fifth_dayof
 #.END
 
 #.TYPE_ATTR
-DirectoryString/teletexString DISPLAY = STR_UNICODE
+DirectoryString/teletexString DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-SyntaxTeletexString DISPLAY = STR_UNICODE
+SyntaxTeletexString DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-SyntaxT61String DISPLAY = STR_UNICODE
+SyntaxT61String DISPLAY = BASE_NONE
 
 #.TYPE_ATTR
-SyntaxVideotexString DISPLAY = STR_UNICODE
+SyntaxVideotexString DISPLAY = BASE_NONE
 
 #.END
 

epan/dissectors/asn1/xnap/xnap.cnf

@@ -508,7 +508,7 @@ VolumeTimedReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u
   }
 
 #.TYPE_ATTR
-BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
+BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY BluetoothName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s
@@ -663,7 +663,7 @@ Threshold-SINR DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(xnap_Threshold_SINR_fmt)
   }
 
 #.TYPE_ATTR
-WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE
+WLANName TYPE=FT_STRING DISPLAY = BASE_NONE
 #.FN_BODY WLANName VAL_PTR = &parameter_tvb HF_INDEX = -1
   tvbuff_t *parameter_tvb = NULL;
 %(DEFAULT_BODY)s

epan/dissectors/file-jpeg.c

@@ -1283,7 +1283,7 @@ proto_register_jfif(void)
         { &hf_comment,
           {   "Comment",
               "image-jfif.comment",
-              FT_STRING, STR_ASCII, NULL, 0x0,
+              FT_STRING, BASE_NONE, NULL, 0x0,
               NULL,
               HFILL
           }

epan/dissectors/file-pcapng.c

@@ -2215,7 +2215,7 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_option_data_comment,
             { "Comment",                                   "pcapng.options.option.data.comment",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_section_header_byte_order_magic,
@@ -2245,27 +2245,27 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_option_data_section_header_hardware,
             { "Hardware",                                  "pcapng.options.option.data.hardware",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_section_header_os,
             { "OS",                                        "pcapng.options.option.data.os",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_section_header_user_application,
             { "User Application",                          "pcapng.options.option.data.user_application",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_interface_description_name,
             { "Name",                                      "pcapng.options.option.data.interface.name",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_interface_description_description,
             { "Description",                               "pcapng.options.option.data.interface.description",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_ipv4,
@@ -2330,7 +2330,7 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_option_data_interface_filter_string,
             { "Filter string",                             "pcapng.options.option.data.interface.filter.string",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_interface_filter_bpf_program,
@@ -2345,12 +2345,12 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_option_data_interface_os,
             { "OS",                                        "pcapng.options.option.data.interface.os",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_interface_hardware,
             { "Hardware",                                  "pcapng.options.option.data.interface.hardware",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_interface_fcs_length,
@@ -2525,7 +2525,7 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_option_data_dns_name,
             { "DNS Name",                                  "pcapng.options.option.data.dns_name",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_data_start_time,
@@ -2670,7 +2670,7 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_record_name,
             { "Name",                                      "pcapng.records.record.data.name",
-            FT_STRINGZ, STR_ASCII, NULL, 0x00,
+            FT_STRINGZ, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_dsb_secrets_type,
@@ -2695,7 +2695,7 @@ proto_register_pcapng(void)
         },
         { &hf_pcapng_option_darwin_process_name,
             { "Darwin Process Name",                       "pcapng.darwin.process_name",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pcapng_option_darwin_process_uuid,

epan/dissectors/file-png.c

@@ -179,11 +179,11 @@ static header_field_info hfi_png_srgb_intent PNG_HFI_INIT = {
     VALS(srgb_intent_vals), 0, NULL, HFILL };
 
 static header_field_info hfi_png_text_keyword PNG_HFI_INIT = {
-    "Keyword", "png.text.keyword", FT_STRING, STR_UNICODE,
+    "Keyword", "png.text.keyword", FT_STRING, BASE_NONE,
     NULL, 0, NULL, HFILL };
 
 static header_field_info hfi_png_text_string PNG_HFI_INIT = {
-    "String", "png.text.string", FT_STRING, STR_UNICODE,
+    "String", "png.text.string", FT_STRING, BASE_NONE,
     NULL, 0, NULL, HFILL };
 
 static header_field_info hfi_png_time_year PNG_HFI_INIT = {

epan/dissectors/packet-adb.c

@@ -870,7 +870,7 @@ proto_register_adb(void)
         },
         { &hf_connection_info,
             { "Info",                            "adb.connection_info",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         }
     };

epan/dissectors/packet-adb_cs.c

@@ -369,7 +369,7 @@ proto_register_adb_cs(void)
         },
         { &hf_hex_ascii_length,
             { "Hex ASCII Length",                "adb_cs.hex_ascii_length",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_length,
@@ -379,17 +379,17 @@ proto_register_adb_cs(void)
         },
         { &hf_service,
             { "Service",                         "adb_cs.service",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_fail_reason,
             { "Fail Reason",                     "adb_cs.fail_reason",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_status,
             { "Status",                          "adb_cs.status",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_data,

epan/dissectors/packet-adb_service.c

@@ -563,7 +563,7 @@ proto_register_adb_service(void)
     static hf_register_info hf[] = {
         { &hf_service,
             { "Service",                         "adb_service.service",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_fragment,
@@ -578,7 +578,7 @@ proto_register_adb_service(void)
         },
         { &hf_hex_ascii_length,
             { "Hex ASCII String Length",         "adb_service.hex_ascii_length",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_length,
@@ -593,7 +593,7 @@ proto_register_adb_service(void)
         },
         { &hf_hex_ascii_version,
             { "Hex ASCII String Version",        "adb_service.hex_ascii_version",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_version,
@@ -708,27 +708,27 @@ proto_register_adb_service(void)
         },
         { &hf_devices,
             { "Devices",                         "adb_service.devices",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_stdin,
             { "Stdin",                           "adb_service.stdin",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_stdout,
             { "Stdout",                          "adb_service.stdout",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_result,
             { "Result",                          "adb_service.result",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_pids,
             { "PIDs",                            "adb_service.pids",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
     };

epan/dissectors/packet-afp.c

@@ -7052,27 +7052,27 @@ proto_register_afp(void)
 
 		{ &hf_afp_utf8_server_name,
 		  { "UTF-8 server name",         "afp.utf8_server_name",
-		    FT_STRING, STR_UNICODE, NULL, 0x0,
+		    FT_STRING, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_afp_server_name,
 		  { "Server name",         "afp.server_name",
-		    FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+		    FT_UINT_STRING, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_afp_server_type,
 		  { "Server type",         "afp.server_type",
-		    FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+		    FT_UINT_STRING, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_afp_server_vers,
 		  { "AFP version",         "afp.server_vers",
-		    FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+		    FT_UINT_STRING, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_afp_server_uams,
 		  { "UAM",         "afp.server_uams",
-		    FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+		    FT_UINT_STRING, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_afp_server_icon,
@@ -7082,7 +7082,7 @@ proto_register_afp(void)
 
 		{ &hf_afp_server_directory,
 		  { "Directory service",         "afp.server_directory",
-		    FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+		    FT_UINT_STRING, BASE_NONE, NULL, 0x0,
 		    "Server directory service", HFILL }},
 
 		{ &hf_afp_server_signature,

epan/dissectors/packet-ansi_637.c

@@ -2826,7 +2826,7 @@ proto_register_ansi_637(void)
         },
         { &hf_ansi_637_tele_user_data_text,
             { "Encoded user data", "ansi_637_tele.user_data.text",
-            FT_STRING, STR_UNICODE, NULL, 0,
+            FT_STRING, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_ansi_637_tele_user_data_encoding,
@@ -3196,7 +3196,7 @@ proto_register_ansi_637(void)
         },
         { &hf_ansi_637_tele_cmas_text,
             { "CMAE_alert_text", "ansi_637_tele.cmas.text",
-            FT_STRING, STR_UNICODE, NULL, 0,
+            FT_STRING, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_ansi_637_tele_mult_enc_user_data_encoding,
@@ -3211,7 +3211,7 @@ proto_register_ansi_637(void)
         },
         { &hf_ansi_637_tele_mult_enc_user_data_text,
             { "Encoded user data", "ansi_637_tele.mult_enc_user_data.text",
-            FT_STRING, STR_UNICODE, NULL, 0,
+            FT_STRING, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_ansi_637_tele_srvc_cat_prog_data_encoding,
@@ -3251,7 +3251,7 @@ proto_register_ansi_637(void)
         },
         { &hf_ansi_637_tele_srvc_cat_prog_data_text,
             { "Encoded program data", "ansi_637_tele.srvc_cat_prog_data.text",
-            FT_STRING, STR_UNICODE, NULL, 0,
+            FT_STRING, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_ansi_637_msb_first_field,

epan/dissectors/packet-at-ldf.c

@@ -122,7 +122,7 @@ proto_register_at_ldf(void)
         },
         { &hf_at_ldf_text,
             { "Information", "atldf.info",
-            FT_STRINGZPAD, STR_ASCII,
+            FT_STRINGZPAD, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         }

epan/dissectors/packet-atalk.c

@@ -1758,13 +1758,13 @@ proto_register_atalk(void)
       { "Enumerator",           "nbp.enum",     FT_UINT8,  BASE_DEC,
                 NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_object,
-      { "Object",               "nbp.object",   FT_UINT_STRING,  STR_UNICODE,
+      { "Object",               "nbp.object",   FT_UINT_STRING,  BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_type,
-      { "Type",         "nbp.type",     FT_UINT_STRING,  STR_UNICODE,
+      { "Type",         "nbp.type",     FT_UINT_STRING,  BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_zone,
-      { "Zone",         "nbp.zone",     FT_UINT_STRING,  STR_UNICODE,
+      { "Zone",         "nbp.zone",     FT_UINT_STRING,  BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_tid,
       { "Transaction ID",               "nbp.tid",      FT_UINT8,  BASE_DEC,
@@ -1978,11 +1978,11 @@ proto_register_atalk(void)
         NULL, HFILL }},
 
     { &hf_zip_zone_name,
-      { "Zone",         "zip.zone_name", FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+      { "Zone",         "zip.zone_name", FT_UINT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
 
     { &hf_zip_default_zone,
-      { "Default zone", "zip.default_zone",FT_UINT_STRING, STR_UNICODE, NULL, 0x0,
+      { "Default zone", "zip.default_zone",FT_UINT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
 
     { &hf_zip_multicast_length,
@@ -2025,7 +2025,7 @@ proto_register_atalk(void)
         "Sequence number", HFILL }},
 
     { &hf_pap_status,
-      { "Status",       "prap.status",   FT_UINT_STRING,  STR_UNICODE, NULL, 0x0,
+      { "Status",       "prap.status",   FT_UINT_STRING,  BASE_NONE, NULL, 0x0,
                 "Printer status", HFILL }},
 
     { &hf_pap_eof,

epan/dissectors/packet-bacapp.c

@@ -15890,7 +15890,7 @@ proto_register_bacapp(void)
         },
         { &hf_bacapp_object_name,
           { "Object Name",           "bacapp.object_name",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_bacapp_instanceNumber,
           { "Instance Number",           "bacapp.instance_number",
@@ -15954,7 +15954,7 @@ proto_register_bacapp(void)
         },
         { &hf_bacapp_present_value_null,
           { "Present Value (null)", "bacapp.present_value.null",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_bacapp_present_value_bool,
           { "Present Value (bool)", "bacapp.present_value.boolean",
@@ -15982,11 +15982,11 @@ proto_register_bacapp(void)
         },
         { &hf_bacapp_present_value_char_string,
           { "Present Value (char string)", "bacapp.present_value.char_string",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_bacapp_present_value_bit_string,
           { "Present Value (bit string)", "bacapp.present_value.bit_string",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_bacapp_present_value_enum_index,
           { "Present Value (enum index)", "bacapp.present_value.enum_index",

epan/dissectors/packet-bgp.c

@@ -10659,7 +10659,7 @@ proto_register_bgp(void)
         { "BGP Shutdown Communication Length", "bgp.notify.communication_length", FT_UINT8, BASE_DEC,
           NULL, 0x0, NULL, HFILL }},
       { &hf_bgp_notify_communication,
-        { "Shutdown Communication", "bgp.notify.communication", FT_STRING, STR_UNICODE,
+        { "Shutdown Communication", "bgp.notify.communication", FT_STRING, BASE_NONE,
           NULL, 0x0, NULL, HFILL }},
 
         /* Route Refresh */
@@ -11506,7 +11506,7 @@ proto_register_bgp(void)
           BASE_HEX, NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_update_encaps_tunnel_subtlv_policy_name_name,
         { "Policy name", "bgp.update.encaps_tunnel_tlv_subtlv.policy_name.name", FT_STRING,
-          STR_ASCII, NULL, 0x0, NULL, HFILL}},
+          BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
       /* BGP update path attribut SSA SAFI (deprecated IETF draft) */
       { &hf_bgp_ssa_t,
@@ -12342,7 +12342,7 @@ proto_register_bgp(void)
           BASE_NONE, NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ls_tlv_link_name_attribute_value,
         {"Link Name", "bgp.ls.tlv.link_name_attribute_value", FT_STRING,
-          STR_ASCII, NULL, 0, NULL, HFILL }},
+          BASE_NONE, NULL, 0, NULL, HFILL }},
       { &hf_bgp_ls_tlv_igp_flags,
         { "IGP Flags TLV", "bgp.ls.tlv.igp_flags", FT_NONE,
           BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -12411,7 +12411,7 @@ proto_register_bgp(void)
          BASE_NONE, NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ls_tlv_node_name_value,
         {"Node name", "bgp.ls.tlv.node_name_value", FT_STRING,
-         STR_ASCII, NULL, 0, NULL, HFILL }},
+         BASE_NONE, NULL, 0, NULL, HFILL }},
       { &hf_bgp_ls_tlv_is_is_area_identifier,
         { "IS-IS Area Identifier TLV", "bgp.ls.tlv.is_is_area_identifier", FT_NONE,
          BASE_NONE, NULL, 0x0, NULL, HFILL}},

epan/dissectors/packet-blip.c

@@ -570,11 +570,11 @@ proto_register_blip(void)
 			NULL, 0x0, NULL, HFILL }
 	},
 	{ &hf_blip_properties,
-		{ "Properties", "blip.props", FT_STRING, STR_UNICODE,
+		{ "Properties", "blip.props", FT_STRING, BASE_NONE,
 			NULL, 0x0, NULL, HFILL }
 		},
 	{ &hf_blip_message_body,
-		{ "Message Body", "blip.messagebody", FT_STRING, STR_UNICODE,
+		{ "Message Body", "blip.messagebody", FT_STRING, BASE_NONE,
 			NULL, 0x0, NULL, HFILL }
 	},
 	{ &hf_blip_ack_size,

epan/dissectors/packet-bluecom.c

@@ -659,7 +659,7 @@ proto_register_bluecom(void)
             BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_identify_name, {
             "Name", "bluecom.identify.name", FT_STRING,
-            STR_ASCII, NULL, 0, NULL, HFILL }},
+            BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_identify_ethaddr, {
             "EthAddr", "bluecom.identify.ethaddr", FT_ETHER,
             BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -676,7 +676,7 @@ proto_register_bluecom(void)
              BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
         { &hf_bcp_searchreq_name, {
             "Name", "bluecom.searchreq.name", FT_STRING,
-            STR_ASCII, NULL, 0, NULL, HFILL }},
+            BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_searchreq_ipaddrfirst, {
             "IpAddrFirst", "bluecom.searchreq.ipaddrfirst", FT_IPv4,
             BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -705,7 +705,7 @@ proto_register_bluecom(void)
             BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_searchrsp_name, {
             "Name", "bluecom.searchrsp.name", FT_STRING,
-            STR_ASCII, NULL, 0, NULL, HFILL }},
+            BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_searchrsp_ethaddr, {
             "EthAddr", "bluecom.searchrsp.ethaddr", FT_ETHER,
             BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -731,7 +731,7 @@ proto_register_bluecom(void)
             BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_connectreq_name, {
             "Name", "bluecom.connectreq.name", FT_STRING,
-            STR_ASCII, NULL, 0, NULL, HFILL }},
+            BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_bcp_connectreq_ethaddr, {
             "EthAddr", "bluecom.connectreq.ethaddr", FT_ETHER,
             BASE_NONE, NULL, 0, NULL, HFILL }},

epan/dissectors/packet-bluetooth.c

@@ -4029,17 +4029,17 @@ proto_register_bluetooth(void)
         },
         { &hf_bluetooth_src_str,
             { "Source",                              "bluetooth.src_str",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_bluetooth_dst_str,
             { "Destination",                         "bluetooth.dst_str",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_bluetooth_addr_str,
             { "Source or Destination",               "bluetooth.addr_str",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
     };

epan/dissectors/packet-bpsec.c

@@ -90,7 +90,7 @@ static hf_register_info fields[] = {
     {&hf_asb_flags, {"Flags", "bpsec.asb.flags", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_asb_flags_has_params, {"Parameters Present", "bpsec.asb.flags.has_params", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BPSEC_ASB_HAS_PARAMS, NULL, HFILL}},
     {&hf_asb_secsrc_nodeid, {"Security Source", "bpsec.asb.secsrc.nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_asb_secsrc_uri, {"Security Source URI", "bpsec.asb.secsrc.uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_asb_secsrc_uri, {"Security Source URI", "bpsec.asb.secsrc.uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_asb_param_list, {"Security Parameters, Count", "bpsec.asb.param_count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_asb_param_pair, {"Parameter", "bpsec.asb.param", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_asb_param_id, {"Type ID", "bpsec.asb.param.id", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},

epan/dissectors/packet-bpv7.c

@@ -245,11 +245,11 @@ static hf_register_info fields[] = {
     {&hf_create_ts_seqno, {"Sequence Number", "bpv7.create_ts.seqno", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_eid_scheme, {"Scheme Code", "bpv7.eid.scheme", FT_UINT64, BASE_DEC | BASE_VAL64_STRING, VALS64(eid_schemes), 0x0, NULL, HFILL}},
     {&hf_eid_dtn_ssp_code, {"DTN SSP", "bpv7.eid.dtn_ssp_code", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
-    {&hf_eid_dtn_ssp_text, {"DTN SSP", "bpv7.eid.dtn_ssp_text", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_eid_dtn_ssp_text, {"DTN SSP", "bpv7.eid.dtn_ssp_text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_eid_ipn_node, {"IPN Node Number", "bpv7.eid.ipn_node", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_eid_ipn_service, {"IPN Service Number", "bpv7.eid.ipn_service", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
-    {&hf_eid_dtn_wkssp, {"Well-known SSP", "bpv7.eid.wkssp", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_eid_dtn_wkssp, {"Well-known SSP", "bpv7.eid.wkssp", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_eid_dtn_serv, {"Service Name", "bpv7.eid.serv", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_eid_dtn_serv, {"Service Name", "bpv7.eid.serv", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_primary_version, {"Version", "bpv7.primary.version", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_primary_bundle_flags, {"Bundle Flags", "bpv7.primary.bundle_flags", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}},
@@ -263,11 +263,11 @@ static hf_register_info fields[] = {
     {&hf_primary_bundle_flags_delivery_report, {"Request reporting of bundle delivery", "bpv7.primary.bundle_flags.delivery_report", FT_BOOLEAN, 24, TFS(&tfs_set_notset), BP_BUNDLE_REQ_DELIVERY_REPORT, NULL, HFILL}},
     {&hf_primary_bundle_flags_deletion_report, {"Request reporting of bundle deletion", "bpv7.primary.bundle_flags.deletion_report", FT_BOOLEAN, 24, TFS(&tfs_set_notset), BP_BUNDLE_REQ_DELETION_REPORT, NULL, HFILL}},
     {&hf_primary_dst_eid, {"Destination Endpoint ID", "bpv7.primary.dst_eid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_primary_dst_uri, {"Destination URI", "bpv7.primary.dst_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_primary_dst_uri, {"Destination URI", "bpv7.primary.dst_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_primary_src_nodeid, {"Source Node ID", "bpv7.primary.src_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_primary_src_uri, {"Source URI", "bpv7.primary.src_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_primary_src_uri, {"Source URI", "bpv7.primary.src_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_primary_report_nodeid, {"Report-to Node ID", "bpv7.primary.report_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_primary_report_uri, {"Report-to URI", "bpv7.primary.report_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_primary_report_uri, {"Report-to URI", "bpv7.primary.report_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_primary_create_ts, {"Creation Timestamp", "bpv7.primary.create_ts", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_primary_lifetime, {"Lifetime", "bpv7.primary.lifetime", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_milliseconds, 0x0, NULL, HFILL}},
     {&hf_primary_lifetime_exp, {"Lifetime Expanded", "bpv7.primary.lifetime_exp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -275,7 +275,7 @@ static hf_register_info fields[] = {
     {&hf_primary_frag_offset, {"Fragment Offset", "bpv7.primary.frag_offset", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}},
     {&hf_primary_total_length, {"Total Application Data Unit Length", "bpv7.primary.total_len", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}},
 
-    {&hf_bundle_ident, {"Bundle Identity", "bpv7.bundle.identity", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_bundle_ident, {"Bundle Identity", "bpv7.bundle.identity", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_bundle_seen, {"First Seen", "bpv7.bundle.first_seen", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_RETRANS_PREV), 0x0, NULL, HFILL}},
     {&hf_bundle_seen_time_diff, {"Seen Time", "bpv7.bundle.seen_time_diff", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_bundle_status_ref, {"Status Bundle", "bpv7.bundle.status_ref", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -326,7 +326,7 @@ static hf_register_info fields[] = {
         FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } },
 
     {&hf_previous_node_nodeid, {"Previous Node ID", "bpv7.previous_node.nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_previous_node_uri, {"Previous URI", "bpv7.previous_node.uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_previous_node_uri, {"Previous URI", "bpv7.previous_node.uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_bundle_age_time, {"Bundle Age", "bpv7.bundle_age.time", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_milliseconds, 0x0, NULL, HFILL}},
 
@@ -345,11 +345,11 @@ static hf_register_info fields[] = {
     {&hf_status_rep_deleted, {"Reporting node deleted bundle", "bpv7.status_rep.deleted", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_status_rep_reason_code, {"Reason Code", "bpv7.status_rep.reason_code", FT_UINT64, BASE_DEC | BASE_VAL64_STRING, VALS64(status_report_reason_vals), 0x0, NULL, HFILL}},
     {&hf_status_rep_subj_src_nodeid, {"Subject Source Node ID", "bpv7.status_rep.subj_src_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_status_rep_subj_src_uri, {"Subject Source URI", "bpv7.status_rep.subj_src_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_status_rep_subj_src_uri, {"Subject Source URI", "bpv7.status_rep.subj_src_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_status_rep_subj_ts, {"Subject Creation Timestamp", "bpv7.status_rep.subj_ts", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_status_rep_subj_frag_offset, {"Subject Fragment Offset", "bpv7.status_rep.subj_frag_offset", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_status_rep_subj_payload_len, {"Subject Payload Length", "bpv7.status_rep.subj_payload_len", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
-    {&hf_status_rep_subj_ident, {"Subject Identity", "bpv7.status_rep.identity", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_status_rep_subj_ident, {"Subject Identity", "bpv7.status_rep.identity", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_status_rep_subj_ref, {"Subject Bundle", "bpv7.status_rep.subj_ref", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, NULL, HFILL}},
     {&hf_status_time_diff, {"Status Time", "bpv7.status_rep.subj_time_diff", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 };

epan/dissectors/packet-btatt.c

@@ -16337,7 +16337,7 @@ proto_register_btatt(void)
         },
         {&hf_btatt_ots_object_name,
             {"Object Name", "btatt.ots.object_name",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL}
         },
         {&hf_btatt_ots_current_size,
@@ -16522,7 +16522,7 @@ proto_register_btatt(void)
         },
         {&hf_btatt_ots_name_string,
             {"Name String", "btatt.ots.name_string",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL}
         },
         {&hf_btatt_ots_object_first_created,

epan/dissectors/packet-caneth.c

@@ -183,7 +183,7 @@ proto_register_caneth(void)
             &hf_caneth_magic,
             {
                 "Magic", "caneth.magic",
-                FT_STRING, STR_ASCII,
+                FT_STRING, BASE_NONE,
                 NULL, 0x0,
                 "The magic identifier used to denote the start of a CAN-ETH packet", HFILL
             }

epan/dissectors/packet-cell_broadcast.c

@@ -508,21 +508,21 @@ proto_register_cbs(void)
          { &hf_gsm_cbs_page_content,
            { "CBS Page Content",
              "gsm_cbs.page_content",
-             FT_STRING, STR_UNICODE, NULL, 0x0,
+             FT_STRING, BASE_NONE, NULL, 0x0,
              NULL, HFILL
            }
          },
          { &hf_gsm_cbs_page_content_padding,
            { "CBS Page Content Padding",
              "gsm_cbs.page_content_padding",
-             FT_STRING, STR_UNICODE, NULL, 0x0,
+             FT_STRING, BASE_NONE, NULL, 0x0,
              NULL, HFILL
            }
          },
          { &hf_gsm_cbs_message_content,
            { "CBS Message Content",
              "gsm_cbs.message_content",
-             FT_STRING, STR_UNICODE, NULL, 0x0,
+             FT_STRING, BASE_NONE, NULL, 0x0,
              NULL, HFILL
            }
          }

epan/dissectors/packet-cose.c

@@ -226,16 +226,16 @@ static hf_register_info fields[] = {
     {&hf_tag, {"Tag", "cose.msg.mac_tag", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_hdr_label_int, {"Label", "cose.header_label.int", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
-    {&hf_hdr_label_tstr, {"Label", "cose.header_label.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_hdr_label_tstr, {"Label", "cose.header_label.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_hdr_salt, {"Salt", "cose.salt", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_static_key, {"Static Key", "cose.static_key", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_ephem_key, {"Ephemeral Key", "cose.ephem_key", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_alg_int, {"Algorithm", "cose.alg.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(alg_vals), 0x0, NULL, HFILL}},
-    {&hf_hdr_alg_tstr, {"Algorithm", "cose.alg.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_hdr_alg_tstr, {"Algorithm", "cose.alg.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_crit_list, {"Critical Headers, Count", "cose.crit", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_ctype_uint, {"Content-Format", "cose.content-type.uint", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}},
-    {&hf_hdr_ctype_tstr, {"Content-Type", "cose.content-type.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_hdr_ctype_tstr, {"Content-Type", "cose.content-type.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_kid, {"Key identifier", "cose.kid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_iv, {"IV", "cose.iv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_piv, {"Partial IV", "cose.piv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -244,18 +244,18 @@ static hf_register_info fields[] = {
     {&hf_hdr_x5chain, {"X509 Chain (x5chain)", "cose.x5chain", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_x5t, {"X509 Thumbprint (x5t)", "cose.x5t", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_hdr_x5t_hash, {"Hash Value", "cose.x5t.hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-    {&hf_hdr_x5u, {"X509 URI (x5u)", "cose.x5u", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_hdr_x5u, {"X509 URI (x5u)", "cose.x5u", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_key, {"COSE_Key", "cose.key", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_keyparam_kty_int, {"Key Type", "cose.kty.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(kty_vals), 0x0, NULL, HFILL}},
-    {&hf_keyparam_kty_tstr, {"Key Type", "cose.kty.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_keyparam_kty_tstr, {"Key Type", "cose.kty.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_keyops_list, {"Key Operations", "cose.keyops", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_keyops_int, {"Operation", "cose.keyops.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(keyops_vals), 0x0, NULL, HFILL}},
-    {&hf_keyparam_keyops_tstr, {"Operation", "cose.keyops.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_keyparam_keyops_tstr, {"Operation", "cose.keyops.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_baseiv, {"Base IV", "cose.baseiv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_crv_int, {"Curve Type", "cose.crv.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(crv_vals), 0x0, NULL, HFILL}},
-    {&hf_keyparam_crv_tstr, {"Curve Type", "cose.crv.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+    {&hf_keyparam_crv_tstr, {"Curve Type", "cose.crv.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_xcoord, {"X-coordinate", "cose.key.xcoord", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_ycoord, {"Y-coordinate", "cose.key.ycoord", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_keyparam_dcoord, {"Private Key", "cose.key.dcoord", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},

epan/dissectors/packet-cql.c

@@ -1825,7 +1825,7 @@ proto_register_cql(void)
 			&hf_cql_string,
 			{
 				"String", "cql.string",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				"UTF-8 string value", HFILL
 			}
@@ -1834,7 +1834,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_global_table_spec_ksname,
 			{
 				"Global Spec Keyspace Name", "cql.result.rows.keyspace_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -1843,7 +1843,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_global_table_spec_table_name,
 			{
 				"Global Spec Table Name", "cql.result.rows.table_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -1852,7 +1852,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_table_name,
 			{
 				"Table Name", "cql.result.rows.table_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -1861,7 +1861,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_udt_name,
 			{
 				"User Defined Type Name", "cql.result.rows.udt_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -1870,7 +1870,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_udt_field_name,
 			{
 				"User Defined Type field Name", "cql.result.rows.udt_field_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -1915,7 +1915,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_keyspace_name,
 			{
 				"Keyspace Name", "cql.result.rows.keyspace_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -1924,7 +1924,7 @@ proto_register_cql(void)
 			&hf_cql_string_result_rows_column_name,
 			{
 				"Column Name", "cql.result.rows.column_name",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -2004,7 +2004,7 @@ proto_register_cql(void)
 			&hf_cql_ascii,
 			{
 				"Ascii", "cql.ascii",
-				FT_STRING, STR_ASCII,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				"An Ascii string", HFILL
 			}
@@ -2076,7 +2076,7 @@ proto_register_cql(void)
 			&hf_cql_varchar,
 			{
 				"Varchar", "cql.varchar",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -2085,7 +2085,7 @@ proto_register_cql(void)
 			&hf_cql_timeuuid,
 			{
 				"Time Uuid", "cql.timeuuid",
-				FT_GUID, STR_ASCII,
+				FT_GUID, BASE_NONE,
 				NULL, 0x0,
 				NULL, HFILL
 			}
@@ -2094,7 +2094,7 @@ proto_register_cql(void)
 			&hf_cql_custom,
 			{
 				"Custom", "cql.custom",
-				FT_STRING, STR_UNICODE,
+				FT_STRING, BASE_NONE,
 				NULL, 0x0,
 				"A custom field", HFILL
 			}

epan/dissectors/packet-credssp.c

@@ -691,7 +691,7 @@ void proto_register_credssp(void) {
         "OCTET_STRING", HFILL }},
     { &hf_credssp_packageName,
       { "packageName", "credssp.packageName",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_credssp_credBuffer,
       { "credBuffer", "credssp.credBuffer",

epan/dissectors/packet-cups.c

@@ -359,16 +359,16 @@ proto_register_cups(void)
             { "State",    "cups.state", FT_UINT8, BASE_HEX,
                 VALS(cups_state_values), 0x0, NULL, HFILL }},
         { &hf_cups_uri,
-            { "URI",    "cups.uri", FT_STRING, STR_UNICODE,
+            { "URI",    "cups.uri", FT_STRING, BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
         { &hf_cups_location,
-            { "Location",    "cups.location", FT_STRING, STR_UNICODE,
+            { "Location",    "cups.location", FT_STRING, BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
         { &hf_cups_information,
-            { "Information",    "cups.information", FT_STRING, STR_UNICODE,
+            { "Information",    "cups.information", FT_STRING, BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
         { &hf_cups_make_model,
-            { "Make and model", "cups.make_model", FT_STRING, STR_UNICODE,
+            { "Make and model", "cups.make_model", FT_STRING, BASE_NONE,
                 NULL, 0x0, NULL, HFILL }},
     };
 

epan/dissectors/packet-daap.c

@@ -717,7 +717,7 @@ proto_register_daap(void)
       },
       { &hf_daap_data_string,
         { "Data string", "daap.data_string",
-           FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+           FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
       },
       { &hf_daap_persistent_id,
         { "Persistent Id", "daap.persistent_id",

epan/dissectors/packet-dbus.c

@@ -1257,21 +1257,21 @@ proto_register_dbus(void) {
 		{ &hf_dbus_padding, { "Padding", "dbus.padding",
 			FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_path, { "Path", "dbus.path",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_interface, { "Interface", "dbus.interface",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_member, { "Member", "dbus.member",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_error_name, { "Error name", "dbus.error_name",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_reply_serial, { "Reply serial", "dbus.reply_serial",
 			FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_destination, { "Destination", "dbus.destination",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_sender, { "Sender", "dbus.sender",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_signature, { "Signature", "dbus.signature",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_unix_fds, { "Unix FDs", "dbus.unix_fds",
 			FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_body, { "Body", "dbus.body",
@@ -1295,11 +1295,11 @@ proto_register_dbus(void) {
 		{ &hf_dbus_type_double, { "Double", "dbus.type.double",
 			FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_string, { "String", "dbus.type.string",
-			FT_UINT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_object_path, { "Object Path", "dbus.type.object_path",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_signature, { "Signature", "dbus.type.signature",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_array, { "Array", "dbus.type.array",
 			FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_array_length, { "Array Length", "dbus.type.array.length",
@@ -1309,7 +1309,7 @@ proto_register_dbus(void) {
 		{ &hf_dbus_type_variant, { "Variant", "dbus.type.variant",
 			FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_variant_signature, { "Variant Signature", "dbus.type.variant.signature",
-			FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }},
+			FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_dict_entry, { "Dict Entry", "dbus.type.dict_entry",
 			FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }},
 		{ &hf_dbus_type_dict_entry_key, { "Key", "dbus.type.dict_entry.key",

epan/dissectors/packet-dhcpv6.c

@@ -3116,7 +3116,7 @@ proto_register_dhcpv6(void)
           { "Remaining length in the domain name field exceeded", "dhcpv6.domain_field_len_exceeded", FT_UINT8, BASE_DEC,
             NULL, 0, NULL, HFILL }},
         { &hf_dhcpv6_decoded_portion,
-          { "Portion successfully decoded", "dhcpv6.decoded_portion", FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL}},
+          { "Portion successfully decoded", "dhcpv6.decoded_portion", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL}},
         { &hf_dhcpv6_encoded_fqdn_len_gt_255,
           { "DNS-encoded labels of FQDN exceed 255 octets", "dhcpv6.encoded_fqdn_gt_255", FT_UINT16, BASE_DEC, NULL, 0,
             "Encoded length is greater than 255 [RFC 1035 3.1.]", HFILL}},
@@ -3124,10 +3124,10 @@ proto_register_dhcpv6(void)
           { "Root only domain name", "dhcpv6.root_only_domain_name", FT_STRING, BASE_NONE, NULL, 0,
             "The root domain cannot be resolved", HFILL}},
         { &hf_dhcpv6_tld,
-          { "Top Level Domain name", "dhcpv6.tld", FT_STRING, STR_ASCII, NULL, 0,
+          { "Top Level Domain name", "dhcpv6.tld", FT_STRING, BASE_NONE, NULL, 0,
             "Likely to fail because most TLDs do not have an IP address", HFILL}},
         { &hf_dhcpv6_partial_name_preceded_by_fqdn,
-          { "Partial name preceded by FQDN", "dhcpv6.partial_name_preceded_by_fqdn", FT_STRING, STR_ASCII, NULL, 0,
+          { "Partial name preceded by FQDN", "dhcpv6.partial_name_preceded_by_fqdn", FT_STRING, BASE_NONE, NULL, 0,
             "Partial domain names must be the only name in the domain field", HFILL}},
 
         { &hf_remoteid_enterprise,
@@ -3239,7 +3239,7 @@ proto_register_dhcpv6(void)
         { &hf_subscriber_id,
           { "Subscriber-ID", "dhcpv6.subscriber_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_client_fqdn,
-          { "Client Domain Name", "dhcpv6.client_domain", FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } },
+          { "Client Domain Name", "dhcpv6.client_domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
         { &hf_pana_agent,
           { "PANA agents address", "dhcpv6.pana_agent", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_opt_timezone,
@@ -3345,7 +3345,7 @@ proto_register_dhcpv6(void)
         { &hf_option_failover_reconfigure_key,
           { "Reconfigure Key", "dhcpv6.failover.reconfigure_key", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_option_failover_relationship_name,
-          { "Relationship Name", "dhcpv6.failover.relationship_name", FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }},
+          { "Relationship Name", "dhcpv6.failover.relationship_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_option_failover_server_flags,
           { "Flags", "dhcpv6.failover.server.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
         { &hf_option_failover_server_reserved_flag,

epan/dissectors/packet-dns.c

@@ -5165,7 +5165,7 @@ proto_register_dns(void)
 
     { &hf_dns_txt,
       { "TXT", "dns.txt",
-        FT_STRING, STR_UNICODE, NULL, 0x0,
+        FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
 
     { &hf_dns_openpgpkey,
@@ -5845,7 +5845,7 @@ proto_register_dns(void)
 
     { &hf_dns_opt_ext_error_extra_text,
       { "Extra Text", "dns.opt.ext_error.extra_text",
-        FT_STRING, STR_UNICODE, NULL, 0x0,
+        FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
 
     { &hf_dns_count_questions,

epan/dissectors/packet-dpnet.c

@@ -553,7 +553,7 @@ proto_register_dpnet(void)
         },
         { &hf_dpnet_session_name,
             { "Session name", "dpnet.session_name",
-            FT_STRING, STR_UNICODE,
+            FT_STRING, BASE_NONE,
             NULL, 0,
             NULL, HFILL }
         },

epan/dissectors/packet-drbd.c

@@ -1157,8 +1157,8 @@ void proto_register_drbd(void)
         { &hf_drbd_oldest_block_id, { "oldest_block_id", "drbd.oldest_block_id", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_youngest_block_id, { "youngest_block_id", "drbd.youngest_block_id", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_resync_rate, { "resync_rate", "drbd.resync_rate", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
-        { &hf_drbd_verify_alg, { "verify_alg", "drbd.verify_alg", FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL }},
+        { &hf_drbd_verify_alg, { "verify_alg", "drbd.verify_alg", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_drbd_csums_alg, { "csums_alg", "drbd.csums_alg", FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL }},
+        { &hf_drbd_csums_alg, { "csums_alg", "drbd.csums_alg", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_c_plan_ahead, { "c_plan_ahead", "drbd.c_plan_ahead", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_c_delay_target, { "c_delay_target", "drbd.c_delay_target", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_c_fill_target, { "c_fill_target", "drbd.c_fill_target", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
@@ -1169,7 +1169,7 @@ void proto_register_drbd(void)
         { &hf_drbd_after_sb_2p, { "after_sb_2p", "drbd.after_sb_2p", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_conn_flags, { "conn_flags", "drbd.conn_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_two_primaries, { "two_primaries", "drbd.two_primaries", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-        { &hf_drbd_integrity_alg, { "integrity_alg", "drbd.integrity_alg", FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL }},
+        { &hf_drbd_integrity_alg, { "integrity_alg", "drbd.integrity_alg", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_current_uuid, { "Current UUID", "drbd.current_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_bitmap_uuid, { "Bitmap UUID", "drbd.bitmap_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_drbd_history_uuid_list, { "History UUIDs", "drbd.history_uuids", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},

epan/dissectors/packet-dvbci.c

@@ -5274,15 +5274,15 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_cis_tpll_v1_info_manuf,
           { "Manufacturer", "dvb-ci.cis.tpll_v1_info.manufacturer",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_cis_tpll_v1_info_name,
           { "Name", "dvb-ci.cis.tpll_v1_info.name",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_cis_tpll_v1_info_additional,
           { "Additional info", "dvb-ci.cis.tpll_v1_info.additional",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_cis_tpll_v1_end,
           { "End of chain", "dvb-ci.cis.tpll_v1_end",
@@ -5330,7 +5330,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_cis_stci_str,
           { "Interface description strings", "dvb-ci.cis.stci_str",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_cis_tpce_indx_intface,
           { "Intface", "dvb-ci.cis.tpce_indx.intface",
@@ -5560,7 +5560,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_menu_str,
           { "Menu string", "dvb-ci.ap.menu_string",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_data_rate,
           { "Transport stream data rate supported by the host",
@@ -5734,7 +5734,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_enq,
           { "Enquiry string", "dvb-ci.mmi.enq",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_ans_id,
           { "Answer ID", "dvb-ci.mmi.ans_id",
@@ -5742,7 +5742,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_ans,
           { "Answer", "dvb-ci.mmi.ans",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_choice_nb,
           { "Number of menu items", "dvb-ci.mmi.choice_nb",
@@ -5758,27 +5758,27 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_title,
           { "Title", "dvb-ci.mmi.title",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_subtitle,
           { "Sub-title", "dvb-ci.mmi.subtitle",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_bottom,
           { "Bottom line", "dvb-ci.mmi.bottom",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_item,
           { "Item", "dvb-ci.mmi.item",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_host_country,
           { "Host country", "dvb-ci.hlc.country",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_host_language,
           { "Host language", "dvb-ci.hlc.language",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_cup_type,
           { "CAM upgrade type", "dvb-ci.cup.type",
@@ -5944,7 +5944,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_pincode,
           { "PIN code", "dvb-ci.cc.pincode",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_app_dom_id_len,
           { "Application Domain Identifier length", "dvb-ci.ami.app_dom_id_len",
@@ -5956,11 +5956,11 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_app_dom_id,
           { "Application Domain Identifier", "dvb-ci.ami.app_dom_id",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_init_obj,
           { "Initial Object", "dvb-ci.ami.init_obj",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_ack_code,
           { "Acknowledgement", "dvb-ci.ami.ack_code",
@@ -5980,7 +5980,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_file_name,
           { "File name", "dvb-ci.ami.file_name",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_file_data_len,
           { "File data length", "dvb-ci.ami.file_data_len",
@@ -6064,7 +6064,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_lsc_hostname,
           { "Hostname", "dvb-ci.lsc.hostname",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_lsc_retry_count,
           { "Retry count", "dvb-ci.lsc.retry_count",
@@ -6104,7 +6104,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_afs_dom_id,
           { "Domain identifier", "dvb-ci.afs.domain_identifier",
-            FT_UINT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }
+            FT_UINT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_afs_ack_code,
           { "Ack code", "dvb-ci.afs.ack_code",
@@ -6222,7 +6222,7 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_opp_lang_code,
           { "Language code", "dvb-ci.opp.lang_code",
-            FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL }
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
         },
         { &hf_dvbci_prof_name,
           { "Profile name", "dvb-ci.opp.profile_name",
@@ -6448,7 +6448,7 @@ proto_register_dvbci(void)
             &dvbci_dissect_lsc_msg);
 
     sas_msg_dissector_table = register_dissector_table("dvb-ci.sas.app_id_str",
-                "SAS application id", proto_dvbci, FT_STRING, STR_ASCII);
+                "SAS application id", proto_dvbci, FT_STRING, BASE_NONE);
 
     register_init_routine(dvbci_init);
     reassembly_table_register(&tpdu_reassembly_table,

epan/dissectors/packet-edonkey.c

@@ -3129,7 +3129,7 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_HEX, NULL, 0, "eDonkey Meta Tag ID", HFILL } },
         { &hf_edonkey_metatag_name,
             { "Meta Tag Name", "edonkey.metatag.name",
-                FT_STRING, STR_ASCII, NULL, 0, "eDonkey Meta Tag Name", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "eDonkey Meta Tag Name", HFILL } },
         { &hf_edonkey_metatag_namesize,
             { "Meta Tag Name Size", "edonkey.metatag.namesize",
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Meta Tag Name Size", HFILL } },
@@ -3138,7 +3138,7 @@ void proto_register_edonkey(void) {
                 FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Hash", HFILL } },
         { &hf_edonkey_string,
             { "String", "edonkey.string",
-                FT_STRING, STR_ASCII, NULL, 0, "eDonkey String", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "eDonkey String", HFILL } },
         { &hf_edonkey_string_length,
             { "String Length", "edonkey.string_length",
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey String Length", HFILL } },
@@ -3150,7 +3150,7 @@ void proto_register_edonkey(void) {
                 FT_BYTES, BASE_NONE, NULL, 0, "eDonkey File Status", HFILL } },
         { &hf_edonkey_directory,
             { "Directory", "edonkey.directory",
-                FT_STRING, STR_ASCII, NULL, 0, "eDonkey Directory", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "eDonkey Directory", HFILL } },
         { &hf_edonkey_fileinfo,
             { "eDonkey File Info", "edonkey.fileinfo",
                 FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
@@ -3210,28 +3210,28 @@ void proto_register_edonkey(void) {
                 FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_peer_id,
             { "Peer ID", "edonkey.kademlia.peer.id",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia Peer ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Peer ID", HFILL } },
         { &hf_kademlia_hash,
             { "Kademlia Hash", "edonkey.kademlia.hash",
-                FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_file_id,
             { "File ID", "edonkey.kademlia.file.id",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia File ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia File ID", HFILL } },
         { &hf_kademlia_keyword_hash,
             { "Keyword Hash", "edonkey.kademlia.keyword.hash",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia Keyword Hash", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Keyword Hash", HFILL } },
         { &hf_kademlia_recipients_id,
             { "Recipient's ID", "edonkey.kademlia.recipients.id",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia Recipient's ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Recipient's ID", HFILL } },
         { &hf_kademlia_sender_id,
             { "Sender ID", "edonkey.kademlia.sender.id",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia Sender ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Sender ID", HFILL } },
         { &hf_kademlia_target_id,
             { "Target ID", "edonkey.kademlia.target.id",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia Target ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Target ID", HFILL } },
         { &hf_kademlia_distance,
             { "XOR Distance", "edonkey.kademlia.distance",
-                FT_STRING, STR_ASCII, NULL, 0, "Kademlia XOR Distance", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia XOR Distance", HFILL } },
         { &hf_kademlia_version,
             { "Kad Version", "edonkey.kademlia.version",
                 FT_UINT8, BASE_DEC_HEX, VALS(kademlia_versions), 0, NULL, HFILL } },
@@ -3258,7 +3258,7 @@ void proto_register_edonkey(void) {
                 FT_STRING, BASE_NONE, NULL, 0, "HASH Tag Value", HFILL } },
         { &hf_kademlia_tag_string,
             { "Tag Value (String)", "edonkey.kademlia.tag.value.string",
-                FT_STRING, STR_ASCII, NULL, 0, "String Tag Value", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "String Tag Value", HFILL } },
         { &hf_kademlia_tag_bsob,
             { "Tag Value (BSOB)", "edonkey.kademlia.tag.value.bsob",
                 FT_BYTES, BASE_NONE, NULL, 0, "BSOB Tag Value", HFILL } },

epan/dissectors/packet-epl.c

@@ -5723,7 +5723,7 @@ proto_register_epl(void)
 		},
 		{ &hf_epl_asnd_identresponse_profile_path,
 			{ "Profile Path", "epl.asnd.ires.profilepath",
-				FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }
+				FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
 		},
 		{ &hf_epl_asnd_identresponse_vid,
 			{ "VendorId", "epl.asnd.ires.vendorid",
@@ -6208,7 +6208,7 @@ proto_register_epl(void)
 		/* EPL Data types */
 		{ &hf_epl_pdo,
 			{ "PDO", "epl.pdo",
-				FT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }
+				FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
 		},
 		{ &hf_epl_pdo_index,
 			{ "Index", "epl.pdo.index",
@@ -6266,7 +6266,7 @@ proto_register_epl(void)
 		},
 		{ &hf_epl_od_string,
 			{ "Data", "epl.od.data.string",
-				FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }
+				FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
 		},
 		{ &hf_epl_od_octet_string,
 			{ "Data", "epl.od.data.bytestring",

epan/dissectors/packet-etsi_card_app_toolkit.c

@@ -1606,7 +1606,7 @@ proto_register_card_app_toolkit(void)
 		},
 		{ &hf_ctlv_alpha_id_string,
 			{ "Alpha Identifier String", "etsi_cat.comp_tlv.alpha_id.string",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_address_ton,
@@ -1621,12 +1621,12 @@ proto_register_card_app_toolkit(void)
 		},
 		{ &hf_ctlv_address_string,
 			{ "Address String", "etsi_cat.comp_tlv.address.string",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_subaddress_string,
 			{ "Subaddress String", "etsi_cat.comp_tlv.subaddress.string",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_result_gen,
@@ -1671,7 +1671,7 @@ proto_register_card_app_toolkit(void)
 		},
 		{ &hf_ctlv_text_string,
 			{ "Text String", "etsi_cat.comp_tlv.text",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_event,
@@ -1691,7 +1691,7 @@ proto_register_card_app_toolkit(void)
 		},
 		{ &hf_ctlv_item_string,
 			{ "Item String", "etsi_cat.comp_tlv.item.string",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_loc_status,
@@ -1751,22 +1751,22 @@ proto_register_card_app_toolkit(void)
 		},
 		{ &hf_ctlv_at_cmd,
 			{ "AT Command", "etsi_cat.comp_tlv.at_cmd",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_at_rsp,
 			{ "AT Response", "etsi_cat.comp_tlv.at_rsp",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_dtmf_string,
 			{ "DMTF String", "etsi_cat.comp_tlv.dtmf.string",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_language,
 			{ "Language", "etsi_cat.comp_tlv.language",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_me_status,
@@ -2021,17 +2021,17 @@ proto_register_card_app_toolkit(void)
 		},
 		{ &hf_ctlv_iari,
 			{ "IARI", "etsi_cat.comp_tlv.iari",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_impu,
 			{ "IMPU", "etsi_cat.comp_tlv.impu",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_ims_status_code,
 			{ "IMS Status-Code", "etsi_cat.comp_tlv.ims_status_code",
-			  FT_STRING, STR_UNICODE, NULL, 0,
+			  FT_STRING, BASE_NONE, NULL, 0,
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_broadcast_nw_tech,

epan/dissectors/packet-gadu-gadu.c

@@ -404,7 +404,7 @@ static header_field_info hfi_gadu_gadu_msg_class GADU_GADU_HFI_INIT =
 	{ "Message class", "gadu-gadu.msg.class", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_gadu_gadu_msg_text GADU_GADU_HFI_INIT =
-	{ "Message text", "gadu-gadu.msg.text", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL };
+	{ "Message text", "gadu-gadu.msg.text", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL };
 
 /* GG_RECV_MSG80, GG_SEND_MSG80 (gadu-gadu.msg80.*) */
 static header_field_info hfi_gadu_gadu_msg80_offset_plain GADU_GADU_HFI_INIT =
@@ -443,7 +443,7 @@ static header_field_info hfi_gadu_gadu_status_img_size GADU_GADU_HFI_INIT =
 	{ "Image size", "gadu-gadu.status.image_size", FT_UINT8, BASE_DEC, NULL, 0x00, "Maximum image size in KB", HFILL };
 
 static header_field_info hfi_gadu_gadu_status_descr GADU_GADU_HFI_INIT =
-	{ "Description", "gadu-gadu.status.description", FT_STRINGZ, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Description", "gadu-gadu.status.description", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 /* Direct Connection (gadu-gadu.dcc.*) */
 static header_field_info hfi_dcc_type GADU_GADU_HFI_INIT =
@@ -466,7 +466,7 @@ static header_field_info hfi_gadu_gadu_new_status_status GADU_GADU_HFI_INIT =
 	{ "Status", "gadu-gadu.new_status.status", FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_gadu_gadu_new_status_desc GADU_GADU_HFI_INIT =
-	{ "Description", "gadu-gadu.new_status.description", FT_STRINGZ, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Description", "gadu-gadu.new_status.description", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 /* Userlist (gadu-gadu.userlist.*) */
 static header_field_info hfi_gadu_gadu_userlist_request_type GADU_GADU_HFI_INIT =

epan/dissectors/packet-gmr1_rr.c

@@ -2070,7 +2070,7 @@ proto_register_gmr1_rr(void)
 		},
 		{ &hf_rr_pos_display_text,
 		  { "Country and Region name", "gmr1.rr.pos_display.text",
-		    FT_STRING, STR_UNICODE, NULL, 0x00,
+		    FT_STRING, BASE_NONE, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_v,

epan/dissectors/packet-gsm_a_dtap.c

@@ -7858,7 +7858,7 @@ proto_register_gsm_a_dtap(void)
         },
         { &hf_gsm_a_dtap_text_string,
           { "Text String", "gsm_a.dtap.text_string",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_gsm_a_dtap_time_zone_time,

epan/dissectors/packet-gsm_a_rr.c

@@ -14353,7 +14353,7 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_ec_imsi,
               { "IMSI", "gsm_a.rr.ec_imsi",
-                FT_STRING, STR_ASCII, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL
               }
             },

epan/dissectors/packet-gsm_cbsp.c

@@ -869,7 +869,7 @@ proto_register_cbsp(void)
 		{ &hf_cbsp_cb_msg_page, { "CBS Message Information Page", "cbsp.cb_msg_page",
 		  FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_cbsp_cbs_page_content, { "CBS Page Content", "cbsp.cb_page_content",
-		  FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } },
+		  FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_cbsp_sched_period, { "Schedule Period", "cbsp.sched_period",
 		  FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_cbsp_num_of_res_slots, { "Number of Reserved Slots", "cbsp.num_of_res_slots",

epan/dissectors/packet-gsm_map.c

@@ -24652,7 +24652,7 @@ void proto_register_gsm_map(void) {
           "Service Area Code", HFILL }},
       { &hf_gsm_map_ussd_string,
         { "USSD String", "gsm_map.ussd_string",
-          FT_STRING, STR_UNICODE, NULL, 0,
+          FT_STRING, BASE_NONE, NULL, 0,
           NULL, HFILL }},
     { &hf_gsm_map_spare_bits,
         { "Spare bit(s)", "gsm_map.spare_bits",
@@ -24822,11 +24822,11 @@ void proto_register_gsm_map(void) {
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_diameter_Name,
       { "diameter-Name", "gsm_map.diameter_Name",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_diameter_Realm,
       { "diameter-Realm", "gsm_map.diameter_Realm",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_cellGlobalIdOrServiceAreaIdFixedLength,
       { "cellGlobalIdOrServiceAreaIdFixedLength", "gsm_map.cellGlobalIdOrServiceAreaIdFixedLength",
@@ -26701,11 +26701,11 @@ void proto_register_gsm_map(void) {
         NULL, HFILL }},
     { &hf_gsm_map_ms_sgsn_Name,
       { "sgsn-Name", "gsm_map.ms.sgsn_Name",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_ms_sgsn_Realm,
       { "sgsn-Realm", "gsm_map.ms.sgsn_Realm",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_ms_lgd_supportIndicator,
       { "lgd-supportIndicator", "gsm_map.ms.lgd_supportIndicator_element",
@@ -28373,7 +28373,7 @@ void proto_register_gsm_map(void) {
         "TA_Id", HFILL }},
     { &hf_gsm_map_ms_mme_Name,
       { "mme-Name", "gsm_map.ms.mme_Name",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_ms_routeingAreaIdentity,
       { "routeingAreaIdentity", "gsm_map.ms.routeingAreaIdentity",
@@ -30095,19 +30095,19 @@ void proto_register_gsm_map(void) {
         "SupportedLCS_CapabilitySets", HFILL }},
     { &hf_gsm_map_lcs_mme_Name,
       { "mme-Name", "gsm_map.lcs.mme_Name",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_aaa_Server_Name,
       { "aaa-Server-Name", "gsm_map.lcs.aaa_Server_Name",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_sgsn_Name,
       { "sgsn-Name", "gsm_map.lcs.sgsn_Name",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_sgsn_Realm,
       { "sgsn-Realm", "gsm_map.lcs.sgsn_Realm",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_locationType,
       { "locationType", "gsm_map.lcs.locationType_element",
@@ -30435,7 +30435,7 @@ void proto_register_gsm_map(void) {
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_mme_Number,
       { "mme-Number", "gsm_map.lcs.mme_Number",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable,
       { "msAvailable", "gsm.map.lcs.DeferredLocationEventType.msAvailable",

epan/dissectors/packet-gsm_sms.c

@@ -2986,22 +2986,22 @@ proto_register_gsm_sms(void)
             },
             { &hf_gsm_sms_tp_oa,
               { "TP-OA Digits", "gsm_sms.tp-oa",
-                FT_STRING, STR_UNICODE, NULL, 0x00,
+                FT_STRING, BASE_NONE, NULL, 0x00,
                 "TP-Originating-Address Digits", HFILL }
             },
             { &hf_gsm_sms_tp_da,
               { "TP-DA Digits", "gsm_sms.tp-da",
-                FT_STRING, STR_UNICODE, NULL, 0x00,
+                FT_STRING, BASE_NONE, NULL, 0x00,
                 "TP-Destination-Address Digits", HFILL }
             },
             { &hf_gsm_sms_tp_ra,
               { "TP-RA Digits", "gsm_sms.tp-ra",
-                FT_STRING, STR_UNICODE, NULL, 0x00,
+                FT_STRING, BASE_NONE, NULL, 0x00,
                 "TP-Recipient-Address Digits", HFILL }
             },
             { &hf_gsm_sms_tp_digits,
               { "Digits", "gsm_sms.tp-digits",
-                FT_STRING, STR_UNICODE, NULL, 0x00,
+                FT_STRING, BASE_NONE, NULL, 0x00,
                 "TP (Unknown) Digits", HFILL }
             },
             { &hf_gsm_sms_tp_pid,
@@ -3066,7 +3066,7 @@ proto_register_gsm_sms(void)
             },
             { &hf_gsm_sms_text,
               { "SMS text", "gsm_sms.sms_text",
-                FT_STRING, STR_UNICODE, NULL, 0x00,
+                FT_STRING, BASE_NONE, NULL, 0x00,
                 "The text of the SMS", HFILL }
             },
             { &hf_gsm_sms_body,

epan/dissectors/packet-gtp.c

@@ -10444,12 +10444,12 @@ proto_register_gtp(void)
         },
         {&hf_gtp_node_name,
          { "Node name", "gtp.node_name",
-           FT_UINT_STRING, STR_ASCII, NULL, 0,
+           FT_UINT_STRING, BASE_NONE, NULL, 0,
            "Diameter Identity of the node", HFILL}
         },
         {&hf_gtp_node_realm,
          { "Node realm", "gtp.node_realm",
-           FT_UINT_STRING, STR_ASCII, NULL, 0,
+           FT_UINT_STRING, BASE_NONE, NULL, 0,
            "Diameter Realm Identity of the node", HFILL}
         },
         {&hf_gtp_npdu_number,

epan/dissectors/packet-hdmi.c

@@ -214,7 +214,7 @@ proto_register_hdmi(void)
                 FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL } },
         { &hf_hdmi_edid_manf_id,
             { "Manufacturer ID", "hdmi.edid.manf_id",
-                FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_hdmi_edid_manf_prod_code,
             { "Manufacturer product code", "hdmi.edid.manf_prod_code",
                 FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } },

epan/dissectors/packet-hicp.c

@@ -242,127 +242,127 @@ proto_register_hicp(void)
     static hf_register_info hf[] = {
         { &hf_hicp_cmd,
           { "Command", "hicp.cmd",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_proto_version,
           { "Protocol version", "hicp.protoversion",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_fb_type,
           { "Fieldbus type", "hicp.fbtype",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_module_version,
           { "Module version", "hicp.moduleversion",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_mac,
           { "MAC address", "hicp.mac",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_ip,
           { "IP address", "hicp.ip",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_sn,
           { "Subnet mask", "hicp.sn",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_gw,
           { "Gateway address", "hicp.gw",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_dhcp,
           { "DHCP", "hicp.dhcp",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_pswd_required,
           { "Password", "hicp.pswdrequired",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_hn,
           { "Hostname", "hicp.hn",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_dns1,
           { "Primary DNS address", "hicp.dns1",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_dns2,
           { "Secondary DNS", "hicp.dns2",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_ext,
           { "Extended commands supported", "hicp.ext",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_pswd,
           { "Password", "hicp.pswd",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_new_pswd,
           { "New password", "hicp.newpswd",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_new_mac,
           { "New MAC address", "hicp.newmac",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_status,
           { "Status", "hicp.status",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_error,
           { "Error", "hicp.error",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_target,
           { "Target", "hicp.target",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_hicp_src,
           { "Source", "hicp.src",
-            FT_STRINGZ, STR_ASCII,
+            FT_STRINGZ, BASE_NONE,
             NULL, 0x0,
             NULL, HFILL }
         }

epan/dissectors/packet-hiqnet.c

@@ -1233,7 +1233,7 @@ proto_register_hiqnet(void)
         },
         { &hf_hiqnet_errstr,
             { "Error string", "hiqnet.errstr",
-                FT_STRINGZ, STR_UNICODE,
+                FT_STRINGZ, BASE_NONE,
                 NULL, 0x0,
                 NULL, HFILL }
         },
@@ -1488,7 +1488,7 @@ proto_register_hiqnet(void)
         /* Counted *and* null-terminated */
         { &hf_hiqnet_string_value,
             { "Value", "hiqnet.string_value",
-                FT_STRINGZ, STR_UNICODE,
+                FT_STRINGZ, BASE_NONE,
                 NULL, 0x0,
                 NULL, HFILL }
         },
@@ -1506,7 +1506,7 @@ proto_register_hiqnet(void)
         },
         { &hf_hiqnet_wrkgrppath,
             { "Workgroup Path", "hiqnet.wrkgrppath",
-                FT_STRINGZ, STR_UNICODE,
+                FT_STRINGZ, BASE_NONE,
                 NULL, 0x0,
                 NULL, HFILL }
         },
@@ -1686,19 +1686,19 @@ proto_register_hiqnet(void)
         },
         { &hf_hiqnet_eventtime,
             { "Time", "hiqnet.eventtime",
-                FT_STRING, STR_UNICODE,
+                FT_STRING, BASE_NONE,
                 NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_hiqnet_eventdate,
             { "Date", "hiqnet.eventdate",
-                FT_STRING, STR_UNICODE,
+                FT_STRING, BASE_NONE,
                 NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_hiqnet_eventinfo,
             { "Information", "hiqnet.information",
-                FT_STRING, STR_UNICODE,
+                FT_STRING, BASE_NONE,
                 NULL, 0x0,
                 NULL, HFILL }
         },

epan/dissectors/packet-http.c

@@ -3942,19 +3942,19 @@ proto_register_http(void)
 		"HTTP Request Method", HFILL }},
 	    { &hf_http_request_uri,
 	      { "Request URI", "http.request.uri",
-		FT_STRING, STR_UNICODE, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"HTTP Request-URI", HFILL }},
 	    { &hf_http_request_path,
 	      { "Request URI Path", "http.request.uri.path",
-		FT_STRING, STR_UNICODE, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"HTTP Request-URI Path", HFILL }},
 	    { &hf_http_request_query,
 	      { "Request URI Query", "http.request.uri.query",
-		FT_STRING, STR_UNICODE, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"HTTP Request-URI Query", HFILL }},
 	    { &hf_http_request_query_parameter,
 	      { "Request URI Query Parameter", "http.request.uri.query.parameter",
-		FT_STRING, STR_UNICODE, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"HTTP Request-URI Query Parameter", HFILL }},
 	    { &hf_http_request_version,
 	      { "Request Version", "http.request.version",
@@ -3978,7 +3978,7 @@ proto_register_http(void)
 		"HTTP Response Status Code Description", HFILL }},
 	    { &hf_http_response_for_uri,
 	      { "Request URI", "http.response_for.uri",
-		FT_STRING, STR_UNICODE, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"HTTP Response For-URI", HFILL }},
 	    { &hf_http_response_phrase,
 	      { "Response Phrase", "http.response.phrase",
@@ -4162,7 +4162,7 @@ proto_register_http(void)
 		NULL, HFILL }},
 	    { &hf_http_file_data,
 	      { "File Data", "http.file_data",
-		FT_STRING, STR_UNICODE, NULL, 0,
+		FT_STRING, BASE_NONE, NULL, 0,
 		NULL, HFILL }},
 	    { &hf_http_unknown_header,
 	      { "Unknown header", "http.unknown_header",

epan/dissectors/packet-http2.c

@@ -629,7 +629,7 @@ register_static_headers(void) {
         {
             &hf_http2_headers_authority,
             {":authority", "http2.headers.authority",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 "Authority portion of the target URI", HFILL}
         },
         {
@@ -641,55 +641,55 @@ register_static_headers(void) {
         {
             &hf_http2_headers_path,
                 {":path", "http2.headers.path",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  NULL, HFILL}
         },
         {
             &hf_http2_headers_method,
                 {":method", "http2.headers.method",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  NULL, HFILL}
         },
         {
             &hf_http2_headers_scheme,
                 {":scheme", "http2.headers.scheme",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  NULL, HFILL}
         },
         {
             &hf_http2_headers_accept,
                 {"accept", "http2.headers.accept",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Media types that are acceptable to the user agent", HFILL}
         },
         {
             &hf_http2_headers_accept_charset,
                 {"accept-charset", "http2.headers.accept_charset",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Acceptable charsets in textual responses for the user agent", HFILL}
         },
         {
             &hf_http2_headers_accept_encoding,
                 {"accept-encoding", "http2.headers.accept_encoding",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Acceptable content codings (like compression) in responses for the user agent", HFILL}
         },
         {
             &hf_http2_headers_accept_language,
                 {"accept-language", "http2.headers.accept_language",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Preferred natural languages for the user agent", HFILL}
         },
         {
             &hf_http2_headers_accept_ranges,
                 {"accept-ranges", "http2.headers.accept_ranges",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Bytes range which server may use for partial data transfer", HFILL}
         },
         {
             &hf_http2_headers_access_control_allow_origin,
                 {"access-control-allow-origin", "http2.headers.access_control_allow_origin",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Origin control for cross-origin resource sharing", HFILL}
         },
         {
@@ -701,37 +701,37 @@ register_static_headers(void) {
         {
             &hf_http2_headers_allow,
                 {"allow", "http2.headers.allow",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "List of allowed methods for request", HFILL}
         },
         {
             &hf_http2_headers_authorization,
                 {"authorization", "http2.headers.authorization",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Credentials for a server-side authorization", HFILL}
         },
         {
             &hf_http2_headers_cache_control,
                 {"cache-control", "http2.headers.cache_control",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Request or response directives for a cache control", HFILL}
         },
         {
             &hf_http2_headers_content_disposition,
                 {"content-disposition", "http2.headers.content_disposition",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Indicates that response will be displayed as page or downloaded with dialog box", HFILL}
         },
         {
             &hf_http2_headers_content_encoding,
                 {"content-encoding", "http2.headers.content_encoding",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  NULL, HFILL}
         },
         {
             &hf_http2_headers_content_language,
                 {"content-language", "http2.headers.content_language",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  NULL, HFILL}
         },
         {
@@ -743,103 +743,103 @@ register_static_headers(void) {
         {
             &hf_http2_headers_content_location,
                 {"content-location", "http2.headers.content_location",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Alternative URL for a response data", HFILL}
         },
         {
             &hf_http2_headers_content_range,
                 {"content-range", "http2.headers.content_range",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Range of bytes which was sent by server for partial data transfer", HFILL}
         },
         {
             &hf_http2_headers_content_type,
                 {"content-type", "http2.headers.content_type",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "MIME type of response", HFILL}
         },
         {
             &hf_http2_headers_cookie,
                 {"cookie", "http2.headers.cookie",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Stored cookies", HFILL}
         },
         {
             &hf_http2_headers_date,
                 {"date", "http2.headers.date",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Date and time at which the data was originated", HFILL}
         },
         {
             &hf_http2_headers_etag,
                 {"etag", "http2.headers.etag",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Directive for version indication of resource", HFILL}
         },
         {
             &hf_http2_headers_expect,
                 {"expect", "http2.headers.expect",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Expectations that need to be fulfilled for correct request", HFILL}
         },
         {
             &hf_http2_headers_expires,
                 {"expires", "http2.headers.expires",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Data after which resource will be stale", HFILL}
         },
         {
             &hf_http2_headers_from,
                 {"from", "http2.headers.from",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Email of a person who responsible for a requesting data", HFILL}
         },
         {
             &hf_http2_headers_if_match,
                 {"if-match", "http2.headers.if_match",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism for requesting data matched by a list of ETags", HFILL}
         },
         {
             &hf_http2_headers_if_modified_since,
                 {"if-modified-since", "http2.headers.if_modified_since",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Resource will be sent with status code 200 if it was modified otherwise with status code 304", HFILL}
         },
         {
             &hf_http2_headers_if_none_match,
                 {"if-none-match", "http2.headers.if_none_match",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism for requesting data not matched by a list of ETags", HFILL}
         },
         {
             &hf_http2_headers_if_range,
                 {"if-range", "http2.headers.if_range",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism for a range request which is used to check if a resource was modified", HFILL}
         },
         {
             &hf_http2_headers_if_unmodified_since,
                 {"if-unmodified-since", "http2.headers.if_unmodified_since",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Resource will be processed if it was not modified otherwise 412 error will be returned", HFILL}
         },
         {
             &hf_http2_headers_last_modified,
                 {"last-modified", "http2.headers.last_modified",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Date and time at which the origin server believes the resource was last modified", HFILL}
         },
         {
             &hf_http2_headers_link,
                 {"link", "http2.headers.link",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism for indicating that resource will be preloaded", HFILL}
         },
         {
             &hf_http2_headers_location,
                 {"location", "http2.headers.location",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism for indicating that client will be redirected", HFILL}
         },
         {
@@ -851,79 +851,79 @@ register_static_headers(void) {
         {
             &hf_http2_headers_proxy_authenticate,
                 {"proxy-authenticate", "http2.headers.proxy_authenticate",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Authentication method that should be used to gain access to a resource behind a proxy server", HFILL}
         },
         {
             &hf_http2_headers_proxy_authorization,
                 {"proxy-authorization", "http2.headers.proxy_authorization",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Credentials for a proxy-side authorization", HFILL}
         },
         {
             &hf_http2_headers_range,
                 {"range", "http2.headers.range",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Range of resource bytes that server should return", HFILL}
         },
         {
             &hf_http2_headers_referer,
                 {"referer", "http2.headers.referer",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Address of the previous web page", HFILL}
         },
         {
             &hf_http2_headers_refresh,
                 {"refresh", "http2.headers.refresh",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Time in seconds after which client will be redirected by given url", HFILL}
         },
         {
             &hf_http2_headers_retry_after,
                 {"retry-after", "http2.headers.retry_after",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism to indicate when resource expected to be available", HFILL}
         },
         {
             &hf_http2_headers_server,
                 {"server", "http2.headers.server",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Information about server software", HFILL}
         },
         {
             &hf_http2_headers_set_cookie,
                 {"set-cookie", "http2.headers.set_cookie",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Send a cookie to the client", HFILL}
         },
         {
             &hf_http2_headers_strict_transport_security,
                 {"strict-transport-security", "http2.headers.strict_transport_security",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "HSTS indicates that resource should be accessed only using HTTPS", HFILL}
         },
         {
             &hf_http2_headers_user_agent,
                 {"user-agent", "http2.headers.user_agent",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Information about client software", HFILL}
         },
         {
             &hf_http2_headers_vary,
                 {"vary", "http2.headers.vary",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Mechanism for selecting which header will be used for content negotiation algorithm", HFILL}
         },
         {
             &hf_http2_headers_via,
                 {"via", "http2.headers.via",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Additional information for loop detection and protocol capabilities in proxy requests", HFILL}
         },
         {
             &hf_http2_headers_www_authenticate,
                 {"www-authenticate", "http2.headers.www_authenticate",
-                 FT_STRING, STR_UNICODE, NULL, 0x0,
+                 FT_STRING, BASE_NONE, NULL, 0x0,
                  "Authentication method that should be used to gain access to a resource", HFILL}
         }
     };

epan/dissectors/packet-ip.c

@@ -2521,19 +2521,19 @@ proto_register_ip(void)
 
     { &hf_geoip_country,
       { "Source or Destination GeoIP Country", "ip.geoip.country",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_country_iso,
       { "Source or Destination GeoIP ISO Two Letter Country Code", "ip.geoip.country_iso",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_city,
       { "Source or Destination GeoIP City", "ip.geoip.city",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_as_number,
       { "Source or Destination GeoIP AS Number", "ip.geoip.asnum",
         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_as_org,
       { "Source or Destination GeoIP AS Organization", "ip.geoip.org",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_latitude,
       { "Source or Destination GeoIP Latitude", "ip.geoip.lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -2542,22 +2542,22 @@ proto_register_ip(void)
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_summary,
       { "Source GeoIP", "ip.geoip.src_summary",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_country,
       { "Source GeoIP Country", "ip.geoip.src_country",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_country_iso,
       { "Source GeoIP ISO Two Letter Country Code", "ip.geoip.src_country_iso",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_city,
       { "Source GeoIP City", "ip.geoip.src_city",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_as_number,
       { "Source GeoIP AS Number", "ip.geoip.src_asnum",
         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_as_org,
       { "Source GeoIP AS Organization", "ip.geoip.src_org",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_latitude,
       { "Source GeoIP Latitude", "ip.geoip.src_lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -2566,22 +2566,22 @@ proto_register_ip(void)
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_summary,
       { "Destination GeoIP", "ip.geoip.dst_summary",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_country,
       { "Destination GeoIP Country", "ip.geoip.dst_country",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_country_iso,
       { "Destination GeoIP ISO Two Letter Country Code", "ip.geoip.dst_country_iso",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_city,
       { "Destination GeoIP City", "ip.geoip.dst_city",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_as_number,
       { "Destination GeoIP AS Number", "ip.geoip.dst_asnum",
         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_as_org,
       { "Destination GeoIP AS Organization", "ip.geoip.dst_org",
-        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_latitude,
       { "Destination GeoIP Latitude", "ip.geoip.dst_lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},

epan/dissectors/packet-ipv6.c

@@ -3292,17 +3292,17 @@ proto_register_ipv6(void)
 
         { &hf_geoip_country,
             { "Source or Destination GeoIP Country", "ipv6.geoip.country",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_country_iso,
             { "Source or Destination GeoIP ISO Two Letter Country Code", "ipv6.geoip.country_iso",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_city,
             { "Source or Destination GeoIP City", "ipv6.geoip.city",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_as_number,
@@ -3312,7 +3312,7 @@ proto_register_ipv6(void)
         },
         { &hf_geoip_as_org,
             { "Source or Destination GeoIP AS Organization", "ipv6.geoip.org",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_latitude,
@@ -3327,22 +3327,22 @@ proto_register_ipv6(void)
         },
         { &hf_geoip_src_summary,
             { "Source GeoIP", "ipv6.geoip.src_summary",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_src_country,
             { "Source GeoIP Country", "ipv6.geoip.src_country",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_src_country_iso,
             { "Source GeoIP ISO Two Letter Country Code", "ipv6.geoip.src_country_iso",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_src_city,
             { "Source GeoIP City", "ipv6.geoip.src_city",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_src_as_number,
@@ -3352,7 +3352,7 @@ proto_register_ipv6(void)
         },
         { &hf_geoip_src_as_org,
             { "Source GeoIP AS Organization", "ipv6.geoip.src_org",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_src_latitude,
@@ -3367,22 +3367,22 @@ proto_register_ipv6(void)
         },
         { &hf_geoip_dst_summary,
             { "Destination GeoIP", "ipv6.geoip.dst_summary",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_dst_country,
             { "Destination GeoIP Country", "ipv6.geoip.dst_country",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_dst_country_iso,
             { "Destination GeoIP ISO Two Letter Country Code", "ipv6.geoip.dst_country_iso",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_dst_city,
             { "Destination GeoIP City", "ipv6.geoip.dst_city",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_dst_as_number,
@@ -3392,7 +3392,7 @@ proto_register_ipv6(void)
         },
         { &hf_geoip_dst_as_org,
             { "Destination GeoIP AS Organization", "ipv6.geoip.dst_org",
-                FT_STRING, STR_UNICODE, NULL, 0x0,
+                FT_STRING, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }
         },
         { &hf_geoip_dst_latitude,

epan/dissectors/packet-irc.c

@@ -485,40 +485,40 @@ void
 proto_register_irc(void)
 {
     static hf_register_info hf[] = {
-        { &hf_irc_response, { "Response", "irc.response", FT_STRING, STR_ASCII,
+        { &hf_irc_response, { "Response", "irc.response", FT_STRING, BASE_NONE,
           NULL, 0x0, "Line of response message", HFILL }},
 
-        { &hf_irc_request, { "Request", "irc.request", FT_STRING, STR_ASCII,
+        { &hf_irc_request, { "Request", "irc.request", FT_STRING, BASE_NONE,
           NULL, 0x0, "Line of request message", HFILL }},
 
-        { &hf_irc_request_prefix, { "Prefix", "irc.request.prefix", FT_STRING, STR_ASCII,
+        { &hf_irc_request_prefix, { "Prefix", "irc.request.prefix", FT_STRING, BASE_NONE,
           NULL, 0x0, "Request prefix", HFILL }},
 
-        { &hf_irc_request_command, { "Command", "irc.request.command", FT_STRING, STR_ASCII,
+        { &hf_irc_request_command, { "Command", "irc.request.command", FT_STRING, BASE_NONE,
           NULL, 0x0, "Request command", HFILL }},
 
-        { &hf_irc_request_command_param, { "Parameter", "irc.request.command_parameter", FT_STRING, STR_ASCII,
+        { &hf_irc_request_command_param, { "Parameter", "irc.request.command_parameter", FT_STRING, BASE_NONE,
           NULL, 0x0, "Request command parameter", HFILL }},
 
-        { &hf_irc_request_trailer, { "Trailer", "irc.request.trailer", FT_STRING, STR_ASCII,
+        { &hf_irc_request_trailer, { "Trailer", "irc.request.trailer", FT_STRING, BASE_NONE,
           NULL, 0x0, "Request trailer", HFILL }},
 
-        { &hf_irc_response_prefix, { "Prefix", "irc.response.prefix", FT_STRING, STR_ASCII,
+        { &hf_irc_response_prefix, { "Prefix", "irc.response.prefix", FT_STRING, BASE_NONE,
           NULL, 0x0, "Response prefix", HFILL }},
 
-        { &hf_irc_response_command, { "Command", "irc.response.command", FT_STRING, STR_ASCII,
+        { &hf_irc_response_command, { "Command", "irc.response.command", FT_STRING, BASE_NONE,
           NULL, 0x0, "Response command", HFILL }},
 
         { &hf_irc_response_num_command, { "Command", "irc.response.num_command", FT_UINT16, BASE_DEC,
           NULL, 0x0, "Response (numeric) command", HFILL }},
 
-        { &hf_irc_response_command_param, { "Parameter", "irc.response.command_parameter", FT_STRING, STR_ASCII,
+        { &hf_irc_response_command_param, { "Parameter", "irc.response.command_parameter", FT_STRING, BASE_NONE,
           NULL, 0x0, "Response command parameter", HFILL }},
 
-        { &hf_irc_response_trailer, { "Trailer", "irc.response.trailer", FT_STRING, STR_ASCII,
+        { &hf_irc_response_trailer, { "Trailer", "irc.response.trailer", FT_STRING, BASE_NONE,
           NULL, 0x0, "Response trailer", HFILL }},
 
-        { &hf_irc_ctcp, { "CTCP Data", "irc.ctcp", FT_STRING, STR_ASCII,
+        { &hf_irc_ctcp, { "CTCP Data", "irc.ctcp", FT_STRING, BASE_NONE,
           NULL, 0x0, "Placeholder to dissect CTCP data", HFILL }}
     };
 

epan/dissectors/packet-iso8583.c

@@ -1013,17 +1013,17 @@ proto_register_iso8583(void)
     },
     { &hf_iso8583_mti,
       { "MTI", "iso8583.mti",
-        FT_STRING, STR_ASCII, NULL , 0,
+        FT_STRING, BASE_NONE, NULL , 0,
         "Message Type Indicator (MTI)", HFILL }
     },
     { &hf_iso8583_bitmap1,
       { "Bitmap 1", "iso8583.map1",
-        FT_STRING, STR_ASCII, NULL , 0,
+        FT_STRING, BASE_NONE, NULL , 0,
         "First Bitmap (hex representation)", HFILL }
     },
     { &hf_iso8583_bitmap2,
       { "Bitmap 2", "iso8583.map2",
-        FT_STRING, STR_ASCII, NULL , 0,
+        FT_STRING, BASE_NONE, NULL , 0,
         "Second Bitmap (hex representation)", HFILL }
     }
   };
@@ -1317,7 +1317,7 @@ proto_register_iso8583(void)
     else
     {
       hf_data[i].hfinfo.type = FT_STRING;
-      hf_data[i].hfinfo.display = STR_ASCII;
+      hf_data[i].hfinfo.display = BASE_NONE;
     }
     hf_data[i].hfinfo.strings = NULL;
     hf_data[i].hfinfo.bitmask = 0;

epan/dissectors/packet-isobus-vt.c

@@ -4530,7 +4530,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_vtchgstrval_value,
           { "Value",                    "isobus.vt.vt_chg_str_val.val",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_vtonuserlayouthideshow_objectid_1,
@@ -5175,7 +5175,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_chgstrval_value,
           { "Value", "isobus.vt.change_string_value.value",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_changebackgroundcolour_objectid,
@@ -5395,7 +5395,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_graphicscontext_drawtext_textstring,
           { "Text string", "isobus.vt.graphics_context.draw_text.point.text_string",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_graphicscontext_panviewport_viewportx,
@@ -5810,7 +5810,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_storeversion_versionlabel,
           { "Version Label",       "isobus.vt.store_version.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_storeversion_errorcodes,
@@ -5820,7 +5820,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_loadversion_versionlabel,
           { "Version Label",       "isobus.vt.load_version.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_loadversion_errorcodes,
@@ -5830,7 +5830,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_deleteversion_versionlabel,
           { "Version Label",       "isobus.vt.delete_version.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_deleteversion_errorcodes,
@@ -5845,12 +5845,12 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_extendedgetversions_versionlabel,
           { "Version label",  "isobus.vt.extended_get_versions.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_extendedstoreversion_versionlabel,
           { "Version Label",       "isobus.vt.extended_store_version.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_extendedstoreversion_errorcodes,
@@ -5860,7 +5860,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_extendedloadversion_versionlabel,
           { "Version Label",       "isobus.vt.extended_load_version.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_extendedloadversion_errorcodes,
@@ -5870,7 +5870,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_extendeddeleteversion_versionlabel,
           { "Version Label",       "isobus.vt.extended_delete_version.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_extendeddeleteversion_errorcodes,
@@ -5885,7 +5885,7 @@ proto_register_isobus_vt(void)
         },
         { &hf_isobus_vt_getversions_versionlabel,
           { "Version label",  "isobus.vt.get_versions.version_label",
-            FT_STRING, STR_ASCII, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_isobus_vt_unsupportedvtfunction_unsupportedvtfunction,

epan/dissectors/packet-json.c

@@ -66,22 +66,22 @@ static header_field_info hfi_json_object JSON_HFI_INIT =
 	{ "Object", "json.object", FT_NONE, BASE_NONE, NULL, 0x00, "JSON object", HFILL };
 
 static header_field_info hfi_json_member JSON_HFI_INIT =
-	{ "Member", "json.member", FT_STRING, STR_UNICODE, NULL, 0x00, "JSON object member", HFILL };
+	{ "Member", "json.member", FT_STRING, BASE_NONE, NULL, 0x00, "JSON object member", HFILL };
 
 static header_field_info hfi_json_key JSON_HFI_INIT =
-	{ "Key", "json.key", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Key", "json.key", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_json_path JSON_HFI_INIT =
-	{ "Path", "json.path", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Path", "json.path", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_json_path_with_value JSON_HFI_INIT =
-	{ "Path with value", "json.path_with_value", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Path with value", "json.path_with_value", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_json_member_with_value JSON_HFI_INIT =
-	{ "Member with value", "json.member_with_value", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Member with value", "json.member_with_value", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_json_value_string JSON_HFI_INIT = /* FT_STRINGZ? */
-	{ "String value", "json.value.string", FT_STRING, STR_UNICODE, NULL, 0x00, "JSON string value", HFILL };
+	{ "String value", "json.value.string", FT_STRING, BASE_NONE, NULL, 0x00, "JSON string value", HFILL };
 
 static header_field_info hfi_json_value_number JSON_HFI_INIT = /* FT_DOUBLE/ FT_INT64? */
 	{ "Number value", "json.value.number", FT_STRING, BASE_NONE, NULL, 0x00, "JSON number value", HFILL };
@@ -115,7 +115,7 @@ static header_field_info hfi_json_binary_data JSON_HFI_INIT =
 	{ "Binary data", "json.binary_data", FT_BYTES, BASE_NONE, NULL, 0x00, "JSON binary data", HFILL };
 
 static header_field_info hfi_json_ignored_leading_bytes JSON_HFI_INIT =
-	{ "Ignored leading bytes", "json.ignored_leading_bytes", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL };
+	{ "Ignored leading bytes", "json.ignored_leading_bytes", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static int hf_json_3gpp_ueepspdnconnection = -1;
 static int hf_json_3gpp_bearerlevelqos = -1;

epan/dissectors/packet-kafka.c

@@ -9395,7 +9395,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_metadata,
             { "Metadata", "kafka.metadata",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_error,
@@ -9405,7 +9405,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_error_message,
             { "Error Message", "kafka.error_message",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_api_key,
@@ -9448,17 +9448,17 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_client_id,
             { "Client ID", "kafka.client_id",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
               "The ID of the sending client.", HFILL }
         },
         { &hf_kafka_client_host,
             { "Client Host", "kafka.client_host",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_transactional_id,
             { "Transactional ID", "kafka.transactional_id",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_transaction_result,
@@ -9483,7 +9483,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_topic_name,
             { "Topic Name", "kafka.topic_name",
-               FT_STRING, STR_UNICODE, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_producer_id,
@@ -9603,7 +9603,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_batch_index_error_message,
             { "Batch Index Error Message", "kafka.batch_index_error_message",
-                FT_STRING, STR_UNICODE, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_message_timestamp,
@@ -9633,17 +9633,17 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_consumer_group,
             { "Consumer Group", "kafka.consumer_group",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_consumer_group_instance,
             { "Consumer Group Instance", "kafka.consumer_group_instance",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_coordinator_key,
             { "Coordinator Key", "kafka.coordinator_key",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_coordinator_type,
@@ -9668,12 +9668,12 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_broker_host,
             { "Host", "kafka.host",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_listener_name,
             { "Listener", "kafka.listener_name",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_broker_port,
@@ -9683,7 +9683,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_rack,
             { "Rack", "kafka.rack",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_broker_security_protocol_type,
@@ -9693,7 +9693,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_cluster_id,
             { "Cluster ID", "kafka.cluster_id",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_controller_id,
@@ -9713,7 +9713,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_group_leader_id,
             { "Leader ID", "kafka.group_leader_id",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_leader_id,
@@ -9803,22 +9803,22 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_group_state,
             { "State", "kafka.group_state",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_member_id,
             { "Consumer Group Member ID", "kafka.member_id",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_protocol_type,
             { "Protocol Type", "kafka.protocol_type",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_protocol_name,
             { "Protocol Name", "kafka.protocol_name",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_protocol_metadata,
@@ -9843,7 +9843,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_sasl_mechanism,
             { "SASL Mechanism", "kafka.sasl_mechanism",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_num_partitions,
@@ -9863,12 +9863,12 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_config_key,
             { "Key", "kafka.config_key",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_config_value,
             { "Value", "kafka.config_value",
-               FT_STRING, STR_ASCII, 0, 0,
+               FT_STRING, BASE_NONE, 0, 0,
                NULL, HFILL }
         },
         { &hf_kafka_config_operation,
@@ -9888,7 +9888,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_forgotten_topic_name,
             { "Forgotten Topic Name", "kafka.forgotten_topic_name",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_forgotten_topic_partition,
@@ -9913,7 +9913,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_record_header_key,
             { "Header Key", "kafka.header_key",
-                FT_STRING, STR_UNICODE, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_record_header_value,
@@ -9958,7 +9958,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_acl_resource_name,
             { "Resource Name", "kafka.acl_resource_name",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_acl_resource_pattern_type,
@@ -9968,12 +9968,12 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_acl_principal,
             { "Principal", "kafka.acl_principal",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_acl_host,
             { "Host", "kafka.acl_host",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_acl_operation,
@@ -9993,7 +9993,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_config_resource_name,
             { "Resource Name", "kafka.config_resource_name",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_config_include_synonyms,
@@ -10023,7 +10023,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_log_dir,
             { "Log Directory", "kafka.log_dir",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_segment_size,
@@ -10063,12 +10063,12 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_token_principal_type,
             { "Principal Type", "kafka.principal_type",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_token_principal_name,
             { "Principal Name", "kafka.principal_name",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_token_issue_timestamp,
@@ -10088,7 +10088,7 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_token_id,
             { "ID", "kafka.token_id",
-                FT_STRING, STR_ASCII, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_token_hmac,
@@ -10143,12 +10143,12 @@ proto_register_kafka_protocol_fields(int protocol)
         },
         { &hf_kafka_client_software_name,
             { "Client Software Name", "kafka.client_software_name",
-                FT_STRING, STR_UNICODE, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
         { &hf_kafka_client_software_version,
             { "Client Software Version", "kafka.client_software_version",
-                FT_STRING, STR_UNICODE, 0, 0,
+                FT_STRING, BASE_NONE, 0, 0,
                 NULL, HFILL }
         },
     };

epan/dissectors/packet-lbmsrs.c

@@ -2672,7 +2672,7 @@ void proto_register_lbmsrs(void)
         { &hf_lbmsrs_rsocket_mdata_len,
         { "Metadata Length", "lbmsrs.rsocket.metadata_len", FT_UINT24, BASE_DEC, NULL,0x0, NULL, HFILL } },
         { &hf_lbmsrs_rsocket_mdata,
-        { "Metadata", "lbmsrs.rsocket.metadata", FT_STRING, STR_ASCII, NULL, 0x0, NULL,HFILL } },
+        { "Metadata", "lbmsrs.rsocket.metadata", FT_STRING, BASE_NONE, NULL, 0x0, NULL,HFILL } },
         { &hf_lbmsrs_rsocket_ignore_flag,
         { "Ignore", "lbmsrs.rsocket.flags.ignore", FT_BOOLEAN, 16, NULL, 0x0200, NULL,HFILL } },
         { &hf_lbmsrs_rsocket_metadata_flag,
@@ -2700,11 +2700,11 @@ void proto_register_lbmsrs(void)
         { &hf_lbmsrs_rsocket_mdata_mime_length,
         { "Metadata MIME Length", "lbmsrs.rsocket.mdata_mime_length", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } },
         { &hf_lbmsrs_rsocket_mdata_mime_type,
-        { "Metadata MIME Type", "lbmsrs.rsocket.mdata_mime_type", FT_STRING, STR_ASCII,NULL, 0x0, NULL, HFILL } },
+        { "Metadata MIME Type", "lbmsrs.rsocket.mdata_mime_type", FT_STRING, BASE_NONE,NULL, 0x0, NULL, HFILL } },
         { &hf_lbmsrs_rsocket_data_mime_length,
         { "Data MIME Length", "lbmsrs.rsocket.data_mime_length", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } },
         { &hf_lbmsrs_rsocket_data_mime_type,
-        { "Data MIME Type", "lbmsrs.rsocket.data_mime_type", FT_STRING, STR_ASCII, NULL,0x0, NULL, HFILL } },
+        { "Data MIME Type", "lbmsrs.rsocket.data_mime_type", FT_STRING, BASE_NONE, NULL,0x0, NULL, HFILL } },
         { &hf_lbmsrs_rsocket_req_n,
         { "Request N", "lbmsrs.rsocket.request_n", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,HFILL } },
         { &hf_lbmsrs_rsocket_error_code,
@@ -2714,7 +2714,7 @@ void proto_register_lbmsrs(void)
         { &hf_lbmsrs_rsocket_resume_token_len,
         { "Resume Token Length", "lbmsrs.rsocket.resume.token.len", FT_UINT16, BASE_DEC,NULL, 0x0, NULL, HFILL } },
         { &hf_lbmsrs_rsocket_resume_token,
-        { "Resume Token", "lbmsrs.rsocket.resume.token", FT_STRING, STR_ASCII, NULL, 0x0,NULL, HFILL } },
+        { "Resume Token", "lbmsrs.rsocket.resume.token", FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL } },
         /*rsocket related items end*/
 
         /*SRS Registration Request items start*/

epan/dissectors/packet-ldap.c

@@ -5168,7 +5168,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_delRequest,
       { "delRequest", "ldap.delRequest",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_delResponse,
       { "delResponse", "ldap.delResponse_element",
@@ -5208,11 +5208,11 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_AttributeDescriptionList_item,
       { "AttributeDescription", "ldap.AttributeDescription",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_attributeDesc,
       { "attributeDesc", "ldap.attributeDesc",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "AttributeDescription", HFILL }},
     { &hf_ldap_assertionValue,
       { "assertionValue", "ldap.assertionValue",
@@ -5220,7 +5220,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_type,
       { "type", "ldap.type",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "AttributeDescription", HFILL }},
     { &hf_ldap_vals,
       { "vals", "ldap.vals",
@@ -5236,11 +5236,11 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_matchedDN,
       { "matchedDN", "ldap.matchedDN",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_errorMessage,
       { "errorMessage", "ldap.errorMessage",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_referral,
       { "referral", "ldap.referral",
@@ -5272,7 +5272,7 @@ void proto_register_ldap(void) {
         "INTEGER_1_127", HFILL }},
     { &hf_ldap_name,
       { "name", "ldap.name",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_authentication,
       { "authentication", "ldap.authentication",
@@ -5308,7 +5308,7 @@ void proto_register_ldap(void) {
         "BindResponse_resultCode", HFILL }},
     { &hf_ldap_bindResponse_matchedDN,
       { "matchedDN", "ldap.matchedDN",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "T_bindResponse_matchedDN", HFILL }},
     { &hf_ldap_serverSaslCreds,
       { "serverSaslCreds", "ldap.serverSaslCreds",
@@ -5316,7 +5316,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_baseObject,
       { "baseObject", "ldap.baseObject",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_scope,
       { "scope", "ldap.scope",
@@ -5384,7 +5384,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_present,
       { "present", "ldap.present",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_approxMatch,
       { "approxMatch", "ldap.approxMatch_element",
@@ -5404,19 +5404,19 @@ void proto_register_ldap(void) {
         "T_substringFilter_substrings_item", HFILL }},
     { &hf_ldap_initial,
       { "initial", "ldap.initial",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPString", HFILL }},
     { &hf_ldap_any,
       { "any", "ldap.any",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPString", HFILL }},
     { &hf_ldap_final,
       { "final", "ldap.final",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPString", HFILL }},
     { &hf_ldap_matchingRule,
       { "matchingRule", "ldap.matchingRule",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "MatchingRuleId", HFILL }},
     { &hf_ldap_matchValue,
       { "matchValue", "ldap.matchValue",
@@ -5428,7 +5428,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_objectName,
       { "objectName", "ldap.objectName",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_searchResultEntry_attributes,
       { "attributes", "ldap.attributes",
@@ -5444,7 +5444,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_object,
       { "object", "ldap.object",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_modifyRequest_modification,
       { "modification", "ldap.modification",
@@ -5464,7 +5464,7 @@ void proto_register_ldap(void) {
         "AttributeTypeAndValues", HFILL }},
     { &hf_ldap_entry,
       { "entry", "ldap.entry",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_attributes,
       { "attributes", "ldap.attributes",
@@ -5476,7 +5476,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_newrdn,
       { "newrdn", "ldap.newrdn",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "RelativeLDAPDN", HFILL }},
     { &hf_ldap_deleteoldrdn,
       { "deleteoldrdn", "ldap.deleteoldrdn",
@@ -5484,7 +5484,7 @@ void proto_register_ldap(void) {
         "BOOLEAN", HFILL }},
     { &hf_ldap_newSuperior,
       { "newSuperior", "ldap.newSuperior",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_ava,
       { "ava", "ldap.ava_element",
@@ -5528,11 +5528,11 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
     { &hf_ldap_attributeType,
       { "attributeType", "ldap.attributeType",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "AttributeDescription", HFILL }},
     { &hf_ldap_orderingRule,
       { "orderingRule", "ldap.orderingRule",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "MatchingRuleId", HFILL }},
     { &hf_ldap_reverseOrder,
       { "reverseOrder", "ldap.reverseOrder",

epan/dissectors/packet-logcat-text.c

@@ -325,12 +325,12 @@ void proto_register_logcat_text(void) {
             },
             { &hf_logcat_text_tag,
                 { "Tag",       "logcat_text.tag",
-                FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL
+                FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL
                 }
             },
             { &hf_logcat_text_log,
                 { "Log",       "logcat_text.log",
-                FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL
+                FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL
                 }
             },
             { &hf_logcat_text_priority,

epan/dissectors/packet-logcat.c

@@ -252,12 +252,12 @@ proto_register_logcat(void)
         },
         { &hf_logcat_tag,
             { "Tag",                             "logcat.tag",
-            FT_STRINGZ, STR_UNICODE, NULL, 0x00,
+            FT_STRINGZ, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_logcat_log,
             { "Log",                             "logcat.log",
-            FT_STRINGZ, STR_UNICODE, NULL, 0x00,
+            FT_STRINGZ, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         }
     };

epan/dissectors/packet-lpp.c

@@ -34314,7 +34314,7 @@ void proto_register_lpp(void) {
         "OCTET_STRING_SIZE_6", HFILL }},
     { &hf_lpp_ssid_r13,
       { "ssid-r13", "lpp.ssid_r13",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_rttValue_r13,
       { "rttValue-r13", "lpp.rttValue_r13",

epan/dissectors/packet-lte-rrc.c

@@ -137823,7 +137823,7 @@ void proto_register_lte_rrc(void) {
         "T_csfb_DualRxTxSupport_r11", HFILL }},
     { &hf_lte_rrc_hnb_Name,
       { "hnb-Name", "lte-rrc.hnb_Name",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageIdentifier,
       { "messageIdentifier", "lte-rrc.messageIdentifier",
@@ -138039,7 +138039,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
     { &hf_lte_rrc_ssid_r12,
       { "ssid-r12", "lte-rrc.ssid_r12",
-        FT_STRING, STR_ASCII, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_bssid_r12,
       { "bssid-r12", "lte-rrc.bssid_r12",
@@ -162663,7 +162663,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
     { &hf_lte_rrc_warningMessageSegment_decoded_page,
       { "Decoded Page", "lte-rrc.warningMessageSegment.decoded_page",
-        FT_STRING, STR_UNICODE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1,
       { "Bit 1", "lte-rrc.interBandTDD_CA_WithDifferentConfig.bit1",

epan/dissectors/packet-mbim.c

@@ -10857,7 +10857,7 @@ proto_register_mbim(void)
         },
         { &hf_mbim_sms_cdma_record_encoded_message_text,
             { "Text", "mbim.control.sms_cdma_record.encoded_message.text",
-            FT_STRING, STR_UNICODE, NULL, 0,
+            FT_STRING, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_mbim_sms_read_req_format,
@@ -10962,7 +10962,7 @@ proto_register_mbim(void)
         },
         { &hf_mbim_sms_send_cdma_encoded_message_text,
             { "Text", "mbim.control.sms_send_cdma.encoded_message.text",
-            FT_STRING, STR_UNICODE, NULL, 0,
+            FT_STRING, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_mbim_set_sms_send_format,
@@ -11032,7 +11032,7 @@ proto_register_mbim(void)
         },
         { &hf_mbim_set_ussd_ussd_payload_text,
             { "USSD Payload Text", "mbim.control.set_ussd.ussd_payload.text",
-               FT_STRING, STR_UNICODE, NULL, 0,
+               FT_STRING, BASE_NONE, NULL, 0,
               NULL, HFILL }
         },
         { &hf_mbim_ussd_info_ussd_response,
@@ -11067,7 +11067,7 @@ proto_register_mbim(void)
         },
         { &hf_mbim_ussd_info_ussd_payload_text,
             { "USSD Payload Text", "mbim.control.ussd_info.ussd_payload.text",
-               FT_STRING, STR_UNICODE, NULL, 0,
+               FT_STRING, BASE_NONE, NULL, 0,
               NULL, HFILL }
         },
         { &hf_mbim_phonebook_configuration_info_phonebook_state,

epan/dissectors/packet-mdp.c

@@ -117,13 +117,13 @@ proto_register_mdp(void)
 
     static hf_register_info hf[] = {
         { &hf_mdp_preamble_data, {"Preamble Data","mdp.preamble_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_mdp_device_info, {"Device Info", "mdp.device_info", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        { &hf_mdp_device_info, {"Device Info", "mdp.device_info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_mdp_network_info, {"Network Info", "mdp.network_info", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        { &hf_mdp_network_info, {"Network Info", "mdp.network_info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_mdp_longitude, {"Longitude", "mdp.longitude", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        { &hf_mdp_longitude, {"Longitude", "mdp.longitude", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_mdp_latitude, {"Latitude", "mdp.latitude", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        { &hf_mdp_latitude, {"Latitude", "mdp.latitude", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_mdp_type, {"Type", "mdp.type", FT_UINT8, BASE_DEC, VALS(type_vals), 0x0, NULL, HFILL }},
-        { &hf_mdp_type_six, {"Type 6 UID", "mdp.type_six", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        { &hf_mdp_type_six, {"Type 6 UID", "mdp.type_six", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_mdp_type_seven, {"Type 7 UID", "mdp.type_seven", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
+        { &hf_mdp_type_seven, {"Type 7 UID", "mdp.type_seven", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_mdp_length, {"Length", "mdp.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_mdp_data, {"Unknown Data", "mdp.data", FT_BYTES, BASE_NONE, NULL, 0X0, NULL, HFILL }}
     };

epan/dissectors/packet-messageanalyzer.c

@@ -1234,7 +1234,7 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_ma_wfp_capture_auth_process_path,
 			{ "Payload Length", "message_analyzer.wfp_capture.auth.process_path",
-			FT_UINT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 	};
 
@@ -1245,7 +1245,7 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_wfp_capture_driver_name,
 			{ "Driver Name", "etw.wfp_capture.driver_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_wfp_capture_major_version,
 			{ "Major Version", "etw.wfp_capture.major_version",
@@ -1269,11 +1269,11 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_wfp_capture_driver_error_message,
 			{ "Driver Name", "etw.wfp_capture.driver_error_message",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_wfp_capture_callout_error_message,
 			{ "Driver Name", "etw.wfp_capture.callout_error_message",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_wfp_capture_nt_status,
 			{ "NT Status", "etw.wfp_capture.nt_status",
@@ -1316,15 +1316,15 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_ndis_source_port_name,
 			{ "Source port name", "etw.ndis.source_port_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_source_nic_name,
 			{ "Source NIC name", "etw.ndis.source_nic_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_source_nic_type,
 			{ "Source NIC type", "etw.ndis.source_nic_type",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_destination_count,
 			{ "Destination count", "etw.ndis.destination_count",
@@ -1336,15 +1336,15 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_ndis_destination_port_name,
 			{ "Destination port name", "etw.ndis.destination_port_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_destination_nic_name,
 			{ "Destination NIC name", "etw.ndis.destination_nic_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_destination_nic_type,
 			{ "Destination NIC type", "etw.ndis.destination_nic_type",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_oob_data_size,
 			{ "OOB data size", "etw.ndis.oob_data_size",
@@ -1360,19 +1360,19 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_ndis_friendly_name,
 			{ "Friendly name", "etw.ndis.friendly_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_unique_name,
 			{ "Unique name", "etw.ndis.unique_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_service_name,
 			{ "Service name", "etw.ndis.service_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_version,
 			{ "Version", "etw.ndis.version",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_media_type,
 			{ "Media types", "etw.ndis.media_type",
@@ -1436,15 +1436,15 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_ndis_param_str,
 			{ "Param String", "etw.ndis.param_str",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_description,
 			{ "Description", "etw.ndis.description",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_source_name,
 			{ "Source name", "etw.ndis.source_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_if_index,
 			{ "IfIndex", "etw.ndis.if_index",
@@ -1460,7 +1460,7 @@ void proto_register_message_analyzer(void)
 		},
 		{ &hf_etw_ndis_layer_name,
 			{ "Layer name", "etw.ndis.layer_name",
-			FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_etw_ndis_keyword,
 			{ "Keyword", "etw.ndis.keyword",

epan/dissectors/packet-mpeg-descriptor.c

@@ -3638,7 +3638,7 @@ proto_register_mpeg_descriptor(void)
 
         { &hf_mpeg_descr_service_provider, {
             "Service Provider Name", "mpeg_descr.svc.provider_name",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
         } },
 
         { &hf_mpeg_descr_service_name_length, {
@@ -3653,7 +3653,7 @@ proto_register_mpeg_descriptor(void)
 
         { &hf_mpeg_descr_service_name, {
             "Service Name", "mpeg_descr.svc.svc_name",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
         } },
 
         /* 0x4A Linkage Descriptor */
@@ -3772,7 +3772,7 @@ proto_register_mpeg_descriptor(void)
 
         { &hf_mpeg_descr_short_event_name, {
             "Event Name", "mpeg_descr.short_evt.name",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
         } },
 
         { &hf_mpeg_descr_short_event_text_length, {
@@ -3787,7 +3787,7 @@ proto_register_mpeg_descriptor(void)
 
         { &hf_mpeg_descr_short_event_text, {
             "Event Text", "mpeg_descr.short_evt.txt",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
         } },
 
         /* 0x4E Extended Event Descriptor */
@@ -3843,7 +3843,7 @@ proto_register_mpeg_descriptor(void)
 
         { &hf_mpeg_descr_extended_event_text, {
             "Text", "mpeg_descr.ext_evt.txt",
-            FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL
+            FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
         } },
 
         /* 0x50 Component Descriptor */

epan/dissectors/packet-mq.c

@@ -4009,7 +4009,7 @@ void proto_register_mq(void)
 {
     static hf_register_info hf[] =
     {
-        {&hf_mq_tsh_StructID, {"StructID..", "mq.tsh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_tsh_StructID, {"StructID..", "mq.tsh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_tsh_mqseglen, {"MQSegmLen.", "mq.tsh.seglength", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH MQ Segment length", HFILL}},
         {&hf_mq_tsh_convid, {"Convers ID", "mq.tsh.convid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Conversation ID", HFILL}},
         {&hf_mq_tsh_requestid, {"Request ID", "mq.tsh.requestid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Request ID", HFILL}},
@@ -4047,27 +4047,27 @@ void proto_register_mq(void)
         {&hf_mq_socket_parm1, {"Parm1....", "mq.socket.parm1", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 1", HFILL}},
         {&hf_mq_socket_parm2, {"Parm2....", "mq.socket.parm2", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 2", HFILL}},
 
-        {&hf_mq_caut_StructID, {"StructID.", "mq.caut.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_caut_StructID, {"StructID.", "mq.caut.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_caut_AuthType, {"AuthType.", "mq.caut.authtype", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT Authority Type", HFILL}},
         {&hf_mq_caut_UsrMaxLen, {"UsrMaxLen", "mq.caut.usrmaxlen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT userid Maximum length", HFILL}},
         {&hf_mq_caut_PwdMaxLen, {"PwdMaxLen", "mq.caut.pwdmaxlen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT password Maximum length", HFILL}},
         {&hf_mq_caut_UsrLength, {"UsrLength", "mq.caut.usrlength", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT userid length", HFILL}},
         {&hf_mq_caut_PwdLength, {"PwdLength", "mq.caut.pswlength", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT password length", HFILL}},
-        {&hf_mq_caut_usr, {"userid...", "mq.msh.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "CAUT UserId", HFILL}},
+        {&hf_mq_caut_usr, {"userid...", "mq.msh.userid", FT_STRING, BASE_NONE, NULL, 0x0, "CAUT UserId", HFILL}},
-        {&hf_mq_caut_psw, {"password.", "mq.msh.password", FT_STRING, STR_UNICODE, NULL, 0x0, "CAUT Password", HFILL}},
+        {&hf_mq_caut_psw, {"password.", "mq.msh.password", FT_STRING, BASE_NONE, NULL, 0x0, "CAUT Password", HFILL}},
 
-        {&hf_mq_msh_StructID, {"StructID", "mq.msh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_msh_StructID, {"StructID", "mq.msh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_msh_seqnum, {"Seq Numb", "mq.msh.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH sequence number", HFILL}},
         {&hf_mq_msh_datalength, {"Buf len.", "mq.msh.buflength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH buffer length", HFILL}},
         {&hf_mq_msh_unknown1, {"Unknown1", "mq.msh.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, "MSH unknown1", HFILL}},
         {&hf_mq_msh_msglength, {"Msg len.", "mq.msh.msglength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH message length", HFILL}},
 
-        {&hf_mq_xqh_StructID, {"StructID", "mq.xqh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_xqh_StructID, {"StructID", "mq.xqh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_xqh_version, {"Version.", "mq.xqh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "XQH version", HFILL}},
-        {&hf_mq_xqh_remoteq, {"Remote Q", "mq.xqh.remoteq", FT_STRING, STR_UNICODE, NULL, 0x0, "XQH remote queue", HFILL}},
+        {&hf_mq_xqh_remoteq, {"Remote Q", "mq.xqh.remoteq", FT_STRING, BASE_NONE, NULL, 0x0, "XQH remote queue", HFILL}},
-        {&hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "XQH remote queue manager", HFILL}},
+        {&hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "XQH remote queue manager", HFILL}},
 
-        {&hf_mq_id_StructID, {"Structid..", "mq.id.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_id_StructID, {"Structid..", "mq.id.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_id_FapLevel, {"FAP level.", "mq.id.faplevel", FT_UINT8, BASE_DEC, NULL, 0x0, "ID Formats And Protocols level", HFILL}},
         {&hf_mq_id_cf1, {"CapFlag1..", "mq.id.cflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability Flags 1", HFILL}},
         {&hf_mq_id_ecf1, {"ECapFlag1.", "mq.id.ecflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability Flags 1", HFILL}},
@@ -4077,11 +4077,11 @@ void proto_register_mq(void)
         {&hf_mq_id_MaxTrSize, {"MaxTrSize.", "mq.id.maxtrsize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max trans size", HFILL}},
         {&hf_mq_id_MaxMsgSize, {"MaxMsgSize", "mq.id.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max msg size", HFILL}},
         {&hf_mq_id_SeqWrapVal, {"SeqWrapVal", "mq.id.seqwrap", FT_UINT32, BASE_DEC, NULL, 0x0, "ID seq wrap value", HFILL}},
-        {&hf_mq_id_channel, {"ChannelNme", "mq.id.channelname", FT_STRING, STR_UNICODE, NULL, 0x0, "ID channel name", HFILL}},
+        {&hf_mq_id_channel, {"ChannelNme", "mq.id.channelname", FT_STRING, BASE_NONE, NULL, 0x0, "ID channel name", HFILL}},
         {&hf_mq_id_cf2, {"CapFlag2..", "mq.id.cflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability flags 2", HFILL}},
         {&hf_mq_id_ecf2, {"ECapFlag2.", "mq.id.ecflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability flags 2", HFILL}},
         {&hf_mq_id_ccsid, {"ccsid.....", "mq.id.ccsid", FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "ID Coded Character Set ID", HFILL}},
-        {&hf_mq_id_qmgrname, {"QMgrName..", "mq.id.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Queue Manager Name", HFILL}},
+        {&hf_mq_id_qmgrname, {"QMgrName..", "mq.id.qm", FT_STRING, BASE_NONE, NULL, 0x0, "ID Queue Manager Name", HFILL}},
         {&hf_mq_id_HBInterval, {"HBInterval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL}},
         {&hf_mq_id_EFLLength, {"EFLLength.", "mq.id.efllength", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "ID EFL Length", HFILL}},
         {&hf_mq_id_ief2, {"IniErrFlg2", "mq.id.inierrflg2", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID Initial Error Flags 2", HFILL}},
@@ -4097,8 +4097,8 @@ void proto_register_mq(void)
         {&hf_mq_id_ProcessId, {"ProcessId.", "mq.id.processid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Process Identifier", HFILL}},
         {&hf_mq_id_ThreadId, {"ThreadId..", "mq.id.threadid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Thread Identifier", HFILL}},
         {&hf_mq_id_TraceId, {"TraceId...", "mq.id.traceid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Trace Identifier", HFILL}},
-        {&hf_mq_id_ProdId, {"ProdId....", "mq.id.prodid", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Product Identifier", HFILL}},
+        {&hf_mq_id_ProdId, {"ProdId....", "mq.id.prodid", FT_STRING, BASE_NONE, NULL, 0x0, "ID Product Identifier", HFILL}},
-        {&hf_mq_id_mqmid, {"MQM ID....", "mq.id.mqmid", FT_STRING, STR_UNICODE, NULL, 0x0, "ID MQM ID", HFILL}},
+        {&hf_mq_id_mqmid, {"MQM ID....", "mq.id.mqmid", FT_STRING, BASE_NONE, NULL, 0x0, "ID MQM ID", HFILL}},
         {&hf_mq_id_pal, {"PAL.......", "mq.id.pal", FT_BYTES, BASE_NONE, NULL, 0x0, "ID PAL", HFILL}},
         {&hf_mq_id_r, {"R.........", "mq.id.r", FT_BYTES, BASE_NONE, NULL, 0x0, "ID R", HFILL}},
 
@@ -4140,28 +4140,28 @@ void proto_register_mq(void)
         {&hf_mq_id_ief2_MsgCmpLst, {"Invalid Msg CompLst", "mq.id.ief2.msgcomplst", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_MSGCOMPLIST, "ID invalid Message Compression List", HFILL}},
         {&hf_mq_id_ief2_SSLReset, {"Invalid SSL Reset", "mq.id.ief2.sslreset", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_SSL_RESET, "ID invalid SSL Reset", HFILL}},
 
-        {&hf_mq_uid_StructID, {"Structid", "mq.uid.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_uid_StructID, {"Structid", "mq.uid.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-        {&hf_mq_uid_userid, {"User ID.", "mq.uid.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "UID structid", HFILL}},
+        {&hf_mq_uid_userid, {"User ID.", "mq.uid.userid", FT_STRING, BASE_NONE, NULL, 0x0, "UID structid", HFILL}},
-        {&hf_mq_uid_password, {"Password", "mq.uid.password", FT_STRING, STR_UNICODE, NULL, 0x0, "UID password", HFILL}},
+        {&hf_mq_uid_password, {"Password", "mq.uid.password", FT_STRING, BASE_NONE, NULL, 0x0, "UID password", HFILL}},
-        {&hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRING, STR_UNICODE, NULL, 0x0, "UID long user id", HFILL}},
+        {&hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRING, BASE_NONE, NULL, 0x0, "UID long user id", HFILL}},
 
         {&hf_mq_sidlen, {"SID Len.", "mq.uid.sidlen", FT_UINT8, BASE_DEC, NULL, 0x0, "Sid Len", HFILL}},
         {&hf_mq_sidtyp, {"SIDType.", "mq.uid.sidtyp", FT_UINT8, BASE_DEC, VALS(GET_VALSV(sidtype)), 0x0, "Sid Typ", HFILL}},
         {&hf_mq_securityid, {"SecurID.", "mq.uid.securityid", FT_BYTES, BASE_NONE, NULL, 0x0, "Security ID", HFILL}},
 
-        {&hf_mq_conn_QMgr, {"QMgr....", "mq.conn.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "CONN queue manager", HFILL}},
+        {&hf_mq_conn_QMgr, {"QMgr....", "mq.conn.qm", FT_STRING, BASE_NONE, NULL, 0x0, "CONN queue manager", HFILL}},
-        {&hf_mq_conn_appname, {"ApplName", "mq.conn.appname", FT_STRING, STR_UNICODE, NULL, 0x0, "CONN application name", HFILL}},
+        {&hf_mq_conn_appname, {"ApplName", "mq.conn.appname", FT_STRING, BASE_NONE, NULL, 0x0, "CONN application name", HFILL}},
         {&hf_mq_conn_apptype, {"ApplType", "mq.conn.apptype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "CONN application type", HFILL}},
         {&hf_mq_conn_acttoken, {"AccntTok", "mq.conn.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "CONN accounting token", HFILL}},
         {&hf_mq_conn_options, {"Options.", "mq.conn.options", FT_UINT32, BASE_DEC, VALS(mq_conn_options_vals), 0x0, "CONN options", HFILL}},
         {&hf_mq_conn_Xoptions, {"XOptions", "mq.conn.xoptions", FT_UINT32, BASE_HEX, NULL, 0x0, "CONN Xoptions", HFILL}},
 
-        {&hf_mq_fcno_StructID, {"StructId..", "mq.fcno.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_fcno_StructID, {"StructId..", "mq.fcno.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_fcno_version, {"version...", "mq.fcno.version", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO version", HFILL}},
         {&hf_mq_fcno_capflag, {"CapFlag...", "mq.fcno.capflag", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO Capability Flag", HFILL}},
 
-        {&hf_mq_fcno_prodid, {"prodid....", "mq.fcno.prodid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Product Id", HFILL}},
+        {&hf_mq_fcno_prodid, {"prodid....", "mq.fcno.prodid", FT_STRING, BASE_NONE, NULL, 0x0, "FCNO Product Id", HFILL}},
-        {&hf_mq_fcno_mqmid, {"MqmId.....", "mq.fcno.mqmid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Mqm ID", HFILL}},
+        {&hf_mq_fcno_mqmid, {"MqmId.....", "mq.fcno.mqmid", FT_STRING, BASE_NONE, NULL, 0x0, "FCNO Mqm ID", HFILL}},
 
         {&hf_mq_fcno_conn_tag, {"conntag...", "mq.fcno.conntag", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO Connection Tag", HFILL}},
         {&hf_mq_fcno_retconn_tag, {"retconntag", "mq.fcno.retconntag", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO Retry Connection Tag", HFILL}},
@@ -4173,13 +4173,13 @@ void proto_register_mq(void)
         {&hf_mq_inq_charlen, {"Character length", "mq.inq.charlen", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Character length", HFILL}},
         {&hf_mq_inq_sel, {"Selector........", "mq.inq.sel", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(selector), 0x0, "INQ Selector", HFILL}},
         {&hf_mq_inq_intvalue, {"Integer value...", "mq.inq.intvalue", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer value", HFILL}},
-        {&hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRING, STR_UNICODE, NULL, 0x0, "INQ Character values", HFILL}},
+        {&hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRING, BASE_NONE, NULL, 0x0, "INQ Character values", HFILL}},
 
         {&hf_mq_spi_verb, {"SPI Verb", "mq.spi.verb", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0, NULL, HFILL}},
         {&hf_mq_spi_version, {"Version", "mq.spi.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Version", HFILL}},
         {&hf_mq_spi_length, {"Max reply size", "mq.spi.replength", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Max reply size", HFILL}},
 
-        {&hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_spi_base_version, {"Version", "mq.spib.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Version", HFILL}},
         {&hf_mq_spi_base_length, {"Length", "mq.spib.length", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Length", HFILL}},
 
@@ -4191,9 +4191,9 @@ void proto_register_mq(void)
         {&hf_mq_spi_spqo_flags, {"Flags", "mq.spqo.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output flags", HFILL}},
 
         {&hf_mq_spi_spai_mode, {"Mode", "mq.spai.mode", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_activate)), 0x0, "SPI Activate Input mode", HFILL}},
-        {&hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown1", HFILL}},
+        {&hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRING, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown1", HFILL}},
-        {&hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown2", HFILL}},
+        {&hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRING, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown2", HFILL}},
-        {&hf_mq_spi_spai_msgid, {"Message Id", "mq.spai.msgid", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input message id", HFILL}},
+        {&hf_mq_spi_spai_msgid, {"Message Id", "mq.spai.msgid", FT_STRING, BASE_NONE, NULL, 0x0, "SPI Activate Input message id", HFILL}},
         {&hf_mq_spi_spgi_batchsz, {"Batch size", "mq.spgi.batchsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch size", HFILL}},
         {&hf_mq_spi_spgi_batchint, {"Batch interval", "mq.spgi.batchint", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch interval", HFILL}},
         {&hf_mq_spi_spgi_maxmsgsz, {"Max message size", "mq.spgi.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input max message size", HFILL}},
@@ -4238,7 +4238,7 @@ void proto_register_mq(void)
         {&hf_mq_open_options_NO_MULTICAST, {"NO_MULTICAST", "mq.open.options.NoMulticast", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_MULTICAST, "OPEN options NO_MULTICAST", HFILL}},
         {&hf_mq_open_options_BIND_ON_GROUP, {"BIND_ON_GROUP", "mq.open.options.BindOnGroup", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_GROUP, "OPEN options BIND_ON_GROUP", HFILL}},
 
-        {&hf_mq_fopa_StructID, {"StructId.......", "mq.fopa.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_fopa_StructID, {"StructId.......", "mq.fopa.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_fopa_version, {"Version........", "mq.fopa.version", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Version", HFILL}},
         {&hf_mq_fopa_length, {"Length.........", "mq.fopa.length", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Length", HFILL}},
         {&hf_mq_fopa_DefPersistence, {"DefPersistence.", "mq.fopa.defpersistence", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPER)), 0x0, "FOPA DefPersistence", HFILL}},
@@ -4247,7 +4247,7 @@ void proto_register_mq(void)
         {&hf_mq_fopa_PropertyControl, {"PropertyControl", "mq.fopa.propertycontrol", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPROP)), 0x0, "FOPA PropertyControl", HFILL}},
         {&hf_mq_fopa_Unknown, {"Unknown........", "mq.fopa.unknown", FT_BYTES, BASE_NONE, NULL, 0x0, "FOPA Unknown", HFILL}},
 
-        {&hf_mq_fcmi_StructID, {"StructId.......", "mq.fcmi.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_fcmi_StructID, {"StructId.......", "mq.fcmi.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_fcmi_unknown, {"Unknown........", "mq.fcmi.unknown", FT_UINT32, BASE_DEC, NULL, 0x0, "FCMI Unknown", HFILL}},
 
         {&hf_mq_msgreq_version, {"version..", "mq.msgreq.version", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ version", HFILL}},
@@ -4288,7 +4288,7 @@ void proto_register_mq(void)
         {&hf_mq_msgasy_MsgToken, {"MsgToken.", "mq.msgasy.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MSGASYNC Mesasage Token", HFILL}},
         {&hf_mq_msgasy_Status, {"status...", "mq.msgasy.status", FT_UINT16, BASE_HEX, NULL, 0x0, "MSGASYNC Status", HFILL}},
         {&hf_mq_msgasy_resolQNLn, {"resolQNLn", "mq.msgasy.resolqnln", FT_UINT8, BASE_DEC, NULL, 0x0, "MSGASYNC Resolved Queue Name Length", HFILL}},
-        {&hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRING, STR_UNICODE, NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL}},
+        {&hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRING, BASE_NONE, NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL}},
         {&hf_mq_msgasy_padding, {"Padding..", "mq.msgasy.padding", FT_BYTES, BASE_NONE, NULL, 0x0, "MSGASYNC Padding", HFILL}},
 
         {&hf_mq_notif_vers, {"version.", "mq.notif.vers", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "NOTIFICATION version", HFILL}},
@@ -4306,13 +4306,13 @@ void proto_register_mq(void)
         {&hf_mq_status_code, {"Code..", "mq.status.code", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(status), 0x0, "STATUS code", HFILL}},
         {&hf_mq_status_value, {"Value.", "mq.status.value", FT_UINT32, BASE_DEC, NULL, 0x0, "STATUS value", HFILL}},
 
-        {&hf_mq_od_StructID, {"StructID.........", "mq.od.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_od_StructID, {"StructID.........", "mq.od.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_od_version, {"version..........", "mq.od.version", FT_UINT32, BASE_DEC, NULL, 0x0, "OD version", HFILL}},
         {&hf_mq_od_objecttype, {"ObjType..........", "mq.od.objtype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(objtype), 0x0, "OD object type", HFILL}},
-        {&hf_mq_od_objectname, {"ObjName..........", "mq.od.objname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD object name", HFILL}},
+        {&hf_mq_od_objectname, {"ObjName..........", "mq.od.objname", FT_STRING, BASE_NONE, NULL, 0x0, "OD object name", HFILL}},
-        {&hf_mq_od_objqmgrname, {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD object queue manager name", HFILL}},
+        {&hf_mq_od_objqmgrname, {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRING, BASE_NONE, NULL, 0x0, "OD object queue manager name", HFILL}},
-        {&hf_mq_od_dynqname, {"DynQName.........", "mq.od.dynqname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD dynamic queue name", HFILL}},
+        {&hf_mq_od_dynqname, {"DynQName.........", "mq.od.dynqname", FT_STRING, BASE_NONE, NULL, 0x0, "OD dynamic queue name", HFILL}},
-        {&hf_mq_od_altuserid, {"AltUserID........", "mq.od.altuserid", FT_STRING, STR_UNICODE, NULL, 0x0, "OD alternate userid", HFILL}},
+        {&hf_mq_od_altuserid, {"AltUserID........", "mq.od.altuserid", FT_STRING, BASE_NONE, NULL, 0x0, "OD alternate userid", HFILL}},
         {&hf_mq_od_recspresent, {"NbrRecord........", "mq.od.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "OD number of records", HFILL}},
         {&hf_mq_od_knowndstcnt, {"Known Dest Count.", "mq.od.kdestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD known destination count", HFILL}},
         {&hf_mq_od_unknowdstcnt, {"Unknown Dest Cnt.", "mq.od.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD unknown destination count", HFILL}},
@@ -4321,13 +4321,13 @@ void proto_register_mq(void)
         {&hf_mq_od_resprecofs, {"Offset of 1st RR.", "mq.od.offsetrr", FT_UINT32, BASE_DEC, NULL, 0x0, "OD offset of first RR", HFILL}},
         {&hf_mq_od_objrecptr, {"Addr   of 1st OR.", "mq.od.addror", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first OR", HFILL}},
         {&hf_mq_od_resprecptr, {"Addr   of 1st RR.", "mq.od.addrrr", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first RR", HFILL}},
-        {&hf_mq_od_altsecurid, {"Alt security id..", "mq.od.altsecid", FT_STRING, STR_UNICODE, NULL, 0x0, "OD alternate security id", HFILL}},
+        {&hf_mq_od_altsecurid, {"Alt security id..", "mq.od.altsecid", FT_STRING, BASE_NONE, NULL, 0x0, "OD alternate security id", HFILL}},
-        {&hf_mq_od_resolvqname, {"Resolved Q Name..", "mq.od.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "OD resolved queue name", HFILL}},
+        {&hf_mq_od_resolvqname, {"Resolved Q Name..", "mq.od.resolvq", FT_STRING, BASE_NONE, NULL, 0x0, "OD resolved queue name", HFILL}},
-        {&hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "OD resolved queue manager name", HFILL}},
+        {&hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "OD resolved queue manager name", HFILL}},
         {&hf_mq_od_resolvobjtyp, {"Resolv Obj Type..", "mq.od.resolvedobjtype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(objtype), 0x0, "OD resolved object type", HFILL}},
 
-        {&hf_mq_or_objname, {"Object name...", "mq.or.objname", FT_STRING, STR_UNICODE, NULL, 0x0, "OR object name", HFILL}},
+        {&hf_mq_or_objname, {"Object name...", "mq.or.objname", FT_STRING, BASE_NONE, NULL, 0x0, "OR object name", HFILL}},
-        {&hf_mq_or_objqmgrname, {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "OR object queue manager name", HFILL}},
+        {&hf_mq_or_objqmgrname, {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRING, BASE_NONE, NULL, 0x0, "OR object queue manager name", HFILL}},
 
         {&hf_mq_rr_compcode, {"Comp Code", "mq.rr.completioncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR completion code", HFILL}},
         {&hf_mq_rr_reascode, {"Reas Code", "mq.rr.reasoncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR reason code", HFILL}},
@@ -4338,7 +4338,7 @@ void proto_register_mq(void)
         {&hf_mq_pmr_feedback, {"Feedback", "mq.pmr.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "PMR Feedback", HFILL}},
         {&hf_mq_pmr_acttoken, {"Accounting token", "mq.pmr.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR accounting token", HFILL}},
 
-        {&hf_mq_md_StructID, {"StructID.", "mq.md.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_md_StructID, {"StructID.", "mq.md.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_md_version, {"Version..", "mq.md.version", FT_UINT32, BASE_DEC, NULL, 0x0, "MD version", HFILL}},
         {&hf_mq_md_report, {"Report...", "mq.md.report", FT_UINT32, BASE_DEC, NULL, 0x0, "MD report", HFILL}},
         {&hf_mq_md_msgtype, {"Msg Type.", "mq.md.msgtype", FT_UINT32, BASE_DEC, VALS(GET_VALSV(MQMT)), 0x0, "MD message type", HFILL}},
@@ -4346,42 +4346,42 @@ void proto_register_mq(void)
         {&hf_mq_md_feedback, {"Feedback.", "mq.md.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "MD feedback", HFILL}},
         {&hf_mq_md_encoding, {"Encoding.", "mq.md.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "MD encoding", HFILL}},
         {&hf_mq_md_ccsid, {"CCSID....", "mq.md.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "MD character set", HFILL}},
-        {&hf_mq_md_format, {"Format...", "mq.md.format", FT_STRING, STR_UNICODE, NULL, 0x0, "MD format", HFILL}},
+        {&hf_mq_md_format, {"Format...", "mq.md.format", FT_STRING, BASE_NONE, NULL, 0x0, "MD format", HFILL}},
         {&hf_mq_md_priority, {"Priority.", "mq.md.priority", FT_INT32, BASE_DEC, NULL, 0x0, "MD priority", HFILL}},
         {&hf_mq_md_persistence, {"Persist..", "mq.md.persistence", FT_UINT32, BASE_DEC, VALS(GET_VALSV(MQPER)), 0x0, "MD persistence", HFILL}},
         {&hf_mq_md_msgid, {"Msg ID...", "mq.md.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Message Id", HFILL}},
         {&hf_mq_md_correlid, {"CorrelID.", "mq.md.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Correlation Id", HFILL}},
         {&hf_mq_md_backoutcnt, {"BackoCnt.", "mq.md.backount", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Backout count", HFILL}},
-        {&hf_mq_md_replytoq, {"ReplyToQ.", "mq.md.replytoq", FT_STRING, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue", HFILL}},
+        {&hf_mq_md_replytoq, {"ReplyToQ.", "mq.md.replytoq", FT_STRING, BASE_NONE, NULL, 0x0, "MD ReplyTo queue", HFILL}},
-        {&hf_mq_md_replytoqmgr, {"RepToQMgr", "mq.md.replytoqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue manager", HFILL}},
+        {&hf_mq_md_replytoqmgr, {"RepToQMgr", "mq.md.replytoqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "MD ReplyTo queue manager", HFILL}},
-        {&hf_mq_md_userid, {"UserId...", "mq.md.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "MD UserId", HFILL}},
+        {&hf_mq_md_userid, {"UserId...", "mq.md.userid", FT_STRING, BASE_NONE, NULL, 0x0, "MD UserId", HFILL}},
         {&hf_mq_md_acttoken, {"AccntTok.", "mq.md.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MD accounting token", HFILL}},
-        {&hf_mq_md_appliddata, {"AppIdData", "mq.md.appldata", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put applicationId data", HFILL}},
+        {&hf_mq_md_appliddata, {"AppIdData", "mq.md.appldata", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put applicationId data", HFILL}},
         {&hf_mq_md_putappltype, {"PutAppTyp", "mq.md.appltype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "MD Put application type", HFILL}},
-        {&hf_mq_md_putapplname, {"PutAppNme", "mq.md.applname", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put application name", HFILL}},
+        {&hf_mq_md_putapplname, {"PutAppNme", "mq.md.applname", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put application name", HFILL}},
-        {&hf_mq_md_putdate, {"PutDatGMT", "mq.md.date", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put date", HFILL}},
+        {&hf_mq_md_putdate, {"PutDatGMT", "mq.md.date", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put date", HFILL}},
-        {&hf_mq_md_puttime, {"PutTimGMT", "mq.md.time", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put time", HFILL}},
+        {&hf_mq_md_puttime, {"PutTimGMT", "mq.md.time", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put time", HFILL}},
-        {&hf_mq_md_apporigdata, {"AppOriDat", "mq.md.origdata", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Application original data", HFILL}},
+        {&hf_mq_md_apporigdata, {"AppOriDat", "mq.md.origdata", FT_STRING, BASE_NONE, NULL, 0x0, "MD Application original data", HFILL}},
         {&hf_mq_md_groupid, {"GroupId..", "mq.md.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD GroupId", HFILL}},
         {&hf_mq_md_msgseqnumber, {"MsgSeqNum", "mq.md.msgseqnumber", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Message sequence number", HFILL}},
         {&hf_mq_md_offset, {"Offset...", "mq.md.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Offset", HFILL}},
         {&hf_mq_md_msgflags, {"Msg flags", "mq.md.msgflags", FT_UINT32, BASE_HEX, NULL, 0x0, "MD Message flags", HFILL}},
         {&hf_mq_md_origlen, {"Orig len.", "mq.md.origlength", FT_INT32, BASE_DEC, NULL, 0x0, "MD Original length", HFILL}},
 
-        {&hf_mq_dlh_StructID, {"StructID.", "mq.dlh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_dlh_StructID, {"StructID.", "mq.dlh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_dlh_version, {"Version..", "mq.dlh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH version", HFILL}},
         {&hf_mq_dlh_reason, {"Reason...", "mq.dlh.reason", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH reason", HFILL}},
-        {&hf_mq_dlh_destq, {"Dest Q...", "mq.dlh.destq", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH destination queue", HFILL}},
+        {&hf_mq_dlh_destq, {"Dest Q...", "mq.dlh.destq", FT_STRING, BASE_NONE, NULL, 0x0, "DLH destination queue", HFILL}},
-        {&hf_mq_dlh_destqmgr, {"DestQMgr.", "mq.dlh.destqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH destination queue manager", HFILL}},
+        {&hf_mq_dlh_destqmgr, {"DestQMgr.", "mq.dlh.destqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "DLH destination queue manager", HFILL}},
         {&hf_mq_dlh_encoding, {"Encoding.", "mq.dlh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH encoding", HFILL}},
         {&hf_mq_dlh_ccsid, {"CCSID....", "mq.dlh.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "DLH character set", HFILL}},
-        {&hf_mq_dlh_format, {"Format...", "mq.dlh.format", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH format", HFILL}},
+        {&hf_mq_dlh_format, {"Format...", "mq.dlh.format", FT_STRING, BASE_NONE, NULL, 0x0, "DLH format", HFILL}},
         {&hf_mq_dlh_putappltype, {"PutAppTyp", "mq.dlh.putappltype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "DLH put application type", HFILL}},
-        {&hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put application name", HFILL}},
+        {&hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRING, BASE_NONE, NULL, 0x0, "DLH put application name", HFILL}},
-        {&hf_mq_dlh_putdate, {"PutDatGMT", "mq.dlh.putdate", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put date", HFILL}},
+        {&hf_mq_dlh_putdate, {"PutDatGMT", "mq.dlh.putdate", FT_STRING, BASE_NONE, NULL, 0x0, "DLH put date", HFILL}},
-        {&hf_mq_dlh_puttime, {"PutTimGMT", "mq.dlh.puttime", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put time", HFILL}},
+        {&hf_mq_dlh_puttime, {"PutTimGMT", "mq.dlh.puttime", FT_STRING, BASE_NONE, NULL, 0x0, "DLH put time", HFILL}},
 
-        {&hf_mq_gmo_StructID, {"StructID.", "mq.gmo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_gmo_StructID, {"StructID.", "mq.gmo.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_gmo_version, {"Version..", "mq.gmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "GMO version", HFILL}},
         {&hf_mq_gmo_options, {"GetMsgOpt", "mq.gmo.getmsgopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO Get Message Options", HFILL}},
 
@@ -4417,7 +4417,7 @@ void proto_register_mq(void)
         {&hf_mq_gmo_waitinterval, {"WaitIntv.", "mq.gmo.waitint", FT_INT32, BASE_DEC, NULL, 0x0, "GMO wait interval", HFILL}},
         {&hf_mq_gmo_signal1, {"Signal 1.", "mq.gmo.signal1", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 1", HFILL}},
         {&hf_mq_gmo_signal2, {"Signal 2.", "mq.gmo.signal2", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 2", HFILL}},
-        {&hf_mq_gmo_resolvqname, {"ResQName.", "mq.gmo.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "GMO resolved queue name", HFILL}},
+        {&hf_mq_gmo_resolvqname, {"ResQName.", "mq.gmo.resolvq", FT_STRING, BASE_NONE, NULL, 0x0, "GMO resolved queue name", HFILL}},
         {&hf_mq_gmo_matchoptions, {"MatchOpt.", "mq.gmo.matchopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO match options", HFILL}},
 
         {&hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN, {"MATCH_MSG_TOKEN", "mq.gmo.matchoptions.MATCH_MSG_TOKEN", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_TOKEN, "GMO matchoptions MATCH_MSG_TOKEN", HFILL}},
@@ -4436,7 +4436,7 @@ void proto_register_mq(void)
         {&hf_mq_gmo_reserved2, {"Reserved2", "mq.gmo.reserved2", FT_INT32, BASE_DEC, NULL, 0x0, "GMO reserved2", HFILL}},
         {&hf_mq_gmo_msghandle, {"MsgHandle", "mq.gmo.msghandle", FT_UINT64, BASE_DEC | BASE_HEX, NULL, 0x0, "GMO Message Handle", HFILL}},
 
-        {&hf_mq_lpoo_StructID, {"StructID......", "mq.lpoo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_lpoo_StructID, {"StructID......", "mq.lpoo.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_lpoo_version, {"version.......", "mq.lpoo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "LPOO version", HFILL}},
         {&hf_mq_lpoo_lpiopts, {"lpiopts.......", "mq.lpoo.lpioopts", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Lpi Options", HFILL}},
 
@@ -4448,11 +4448,11 @@ void proto_register_mq(void)
         {&hf_mq_lpoo_defputresptype, {"DefPutRespType", "mq.lpoo.defputresptype", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPRT)), 0x0, "LPOO Default Put Response Type", HFILL}},
         {&hf_mq_lpoo_defreadahead, {"DefReadAHead..", "mq.lpoo.defreadahead", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQREADA)), 0x0, "LPOO Default Read AHead", HFILL}},
         {&hf_mq_lpoo_propertyctl, {"PropertyCtl...", "mq.lpoo.propertyctl", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO Property Control", HFILL}},
-        {&hf_mq_lpoo_qprotect, {"qprotect......", "mq.lpoo.qprotect", FT_STRING, STR_UNICODE, NULL, 0x0, "LPOO queue protection", HFILL}},
+        {&hf_mq_lpoo_qprotect, {"qprotect......", "mq.lpoo.qprotect", FT_STRING, BASE_NONE, NULL, 0x0, "LPOO queue protection", HFILL}},
         {&hf_mq_lpoo_qprotect_val1, {"qprotect_val1.", "mq.lpoo.qprotect.val2", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO queue protection val1", HFILL}},
         {&hf_mq_lpoo_qprotect_val2, {"qprotect_val2.", "mq.lpoo.qprotect.val1", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO queue protection val2", HFILL}},
 
-        {&hf_mq_pmo_StructID, {"StructID...", "mq.pmo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}},
+        {&hf_mq_pmo_StructID, {"StructID...", "mq.pmo.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         {&hf_mq_pmo_version, {"Version....", "mq.pmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO version", HFILL}},
         {&hf_mq_pmo_options, {"Options....", "mq.pmo.options", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO options", HFILL}},
         {&hf_mq_pmo_options_NOT_OWN_SUBS, {"NOT_OWN_SUBS", "mq.pmo.options.NOT_OWN_SUBS", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NOT_OWN_SUBS, "PMO options NOT_OWN_SUBS", HFILL}},
@@ -4483,8 +4483,8 @@ void proto_register_mq(void)
         {&hf_mq_pmo_knowndstcnt, {"KnDstCnt...", "mq.pmo.kdstcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO known destination count", HFILL}},
         {&hf_mq_pmo_unkndstcnt, {"UkDstCnt...", "mq.pmo.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO unknown destination count", HFILL}},
         {&hf_mq_pmo_invaldstcnt, {"InDstCnt...", "mq.pmo.idestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO invalid destination count", HFILL}},
-        {&hf_mq_pmo_resolvqname, {"ResQName...", "mq.pmo.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "PMO resolved queue name", HFILL}},
+        {&hf_mq_pmo_resolvqname, {"ResQName...", "mq.pmo.resolvq", FT_STRING, BASE_NONE, NULL, 0x0, "PMO resolved queue name", HFILL}},
-        {&hf_mq_pmo_resolvqmgr, {"ResQMgr....", "mq.pmo.resolvqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "PMO resolved queue manager name", HFILL}},
+        {&hf_mq_pmo_resolvqmgr, {"ResQMgr....", "mq.pmo.resolvqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "PMO resolved queue manager name", HFILL}},
         {&hf_mq_pmo_recspresent, {"NumRecs....", "mq.pmo.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO number of records", HFILL}},
         {&hf_mq_pmo_putmsgrecfld, {"PMR Flag...", "mq.pmo.flagspmr", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO flags PMR fields", HFILL}},
         {&hf_mq_pmo_putmsgrecofs, {"Ofs1stPMR..", "mq.pmo.offsetpmr", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO offset of first PMR", HFILL}},
@@ -4510,27 +4510,27 @@ void proto_register_mq(void)
         {&hf_mq_xa_tmflags_fail, {"FAIL", "mq.xa.tmflags.fail", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMFAIL, "XA TM Flags FAIL", HFILL}},
         {&hf_mq_xa_tmflags_onephase, {"ONEPHASE", "mq.xa.tmflags.onephase", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMONEPHASE, "XA TM Flags ONEPHASE", HFILL}},
 
-        {&hf_mq_xa_xid_formatid, {"Format ID....", "mq.xa.xid.formatid", FT_STRING, STR_UNICODE, NULL, 0x0, "XA Xid Format ID", HFILL}},
+        {&hf_mq_xa_xid_formatid, {"Format ID....", "mq.xa.xid.formatid", FT_STRING, BASE_NONE, NULL, 0x0, "XA Xid Format ID", HFILL}},
         {&hf_mq_xa_xid_glbxid_len, {"GlbTransIDLen", "mq.xa.xid.gxidl", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Global TransactionId Length", HFILL}},
         {&hf_mq_xa_xid_brq_length, {"BranchQualLen", "mq.xa.xid.bql", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Branch Qualifier Length", HFILL}},
         {&hf_mq_xa_xid_globalxid, {"GlbTransactID", "mq.xa.xid.gxid", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Global TransactionId", HFILL}},
         {&hf_mq_xa_xid_brq, {"BranchQualif.", "mq.xa.xid.bq", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Branch Qualifier", HFILL}},
         {&hf_mq_xa_xainfo_length, {"Length.......", "mq.xa.xainfo.length", FT_UINT8, BASE_DEC, NULL, 0x0, "XA XA_info Length", HFILL}},
-        {&hf_mq_xa_xainfo_value, {"Value........", "mq.xa.xainfo.value", FT_STRING, STR_UNICODE, NULL, 0x0, "XA XA_info Value", HFILL}},
+        {&hf_mq_xa_xainfo_value, {"Value........", "mq.xa.xainfo.value", FT_STRING, BASE_NONE, NULL, 0x0, "XA XA_info Value", HFILL}},
 
         {&hf_mq_charv_vsptr, {"VLStr Addr.", "mq.charv.vsptr", FT_UINT32, BASE_HEX, NULL, 0x0, "VS Address", HFILL}},
         {&hf_mq_charv_vsoffset, {"VLStr Offs.", "mq.charv.vsoffset", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Offset", HFILL}},
         {&hf_mq_charv_vsbufsize, {"VLStr BufSz", "mq.charv.vsbufsize", FT_UINT32, BASE_DEC, NULL, 0x0, "VS BufSize", HFILL}},
         {&hf_mq_charv_vslength, {"VLStr Len..", "mq.charv.vslength", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Length", HFILL}},
         {&hf_mq_charv_vsccsid, {"VLStr Ccsid", "mq.charv.vsccsid", FT_INT32, BASE_DEC, NULL, 0x0, "VS CCSID", HFILL}},
-        {&hf_mq_charv_vsvalue, {"VLStr Value", "mq.charv.vsvalue", FT_STRING, STR_UNICODE, NULL, 0x0, "VS value", HFILL}},
+        {&hf_mq_charv_vsvalue, {"VLStr Value", "mq.charv.vsvalue", FT_STRING, BASE_NONE, NULL, 0x0, "VS value", HFILL}},
 
-        {&hf_mq_head_StructID, {"Structid", "mq.head.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "Header structid", HFILL}},
+        {&hf_mq_head_StructID, {"Structid", "mq.head.structid", FT_STRING, BASE_NONE, NULL, 0x0, "Header structid", HFILL}},
         {&hf_mq_head_version, {"version.", "mq.head.version", FT_UINT32, BASE_DEC, NULL, 0x0, "Header version", HFILL}},
         {&hf_mq_head_length, {"Length..", "mq.head.length", FT_UINT32, BASE_DEC, NULL, 0x0, "Header length", HFILL}},
         {&hf_mq_head_encoding, {"Encoding", "mq.head.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "Header encoding", HFILL}},
         {&hf_mq_head_ccsid, {"CCSID...", "mq.head.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "Header character set", HFILL}},
-        {&hf_mq_head_format, {"Format..", "mq.head.format", FT_STRING, STR_UNICODE, NULL, 0x0, "Header format", HFILL}},
+        {&hf_mq_head_format, {"Format..", "mq.head.format", FT_STRING, BASE_NONE, NULL, 0x0, "Header format", HFILL}},
 
         {&hf_mq_head_flags, {"Flags...", "mq.head.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "Header flags", HFILL}},
         {&hf_mq_head_struct, {"Struct..", "mq.head.struct", FT_BYTES, BASE_NONE, NULL, 0x0, "Header struct", HFILL}},
@@ -4547,15 +4547,15 @@ void proto_register_mq(void)
         {&hf_mq_iih_flags_replyfmtnone, {"REPL_FMT_NONE", "mq.iih.flags.replyfmtnone", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQIIH_REPLY_FORMAT_NONE, "MQ IIH Flags REPLY_FORMAT_NONE", HFILL}},
         {&hf_mq_iih_flags_passexpir, {"PASS_EXPIR...", "mq.iih.flags.passexpir", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQIIH_PASS_EXPIRATION, "MQ IIH Flags PASS_EXPIRATION", HFILL}},
 
-        {&hf_mq_iih_ltermoverride, {"LTerm Override", "mq.iih.ltermoverrid", FT_STRING, STR_UNICODE, NULL, 0x0, "Logical Terminal Override", HFILL}},
+        {&hf_mq_iih_ltermoverride, {"LTerm Override", "mq.iih.ltermoverrid", FT_STRING, BASE_NONE, NULL, 0x0, "Logical Terminal Override", HFILL}},
-        {&hf_mq_iih_mfsmapname, {"MFS Map Name..", "mq.iih.mfsmapname", FT_STRING, STR_UNICODE, NULL, 0x0, "MFS Map Name", HFILL}},
+        {&hf_mq_iih_mfsmapname, {"MFS Map Name..", "mq.iih.mfsmapname", FT_STRING, BASE_NONE, NULL, 0x0, "MFS Map Name", HFILL}},
-        {&hf_mq_iih_replytofmt, {"ReplyToFormat.", "mq.iih.replytofmt", FT_STRING, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL}},
+        {&hf_mq_iih_replytofmt, {"ReplyToFormat.", "mq.iih.replytofmt", FT_STRING, BASE_NONE, NULL, 0x0, "Reply To Format", HFILL}},
-        {&hf_mq_iih_authenticator, {"Authenticator.", "mq.iih.authenticator", FT_STRING, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL}},
+        {&hf_mq_iih_authenticator, {"Authenticator.", "mq.iih.authenticator", FT_STRING, BASE_NONE, NULL, 0x0, "Password or Passcode", HFILL}},
         {&hf_mq_iih_transinstid, {"TransInstIdent", "mq.iih.transinstid", FT_BYTES, BASE_NONE, NULL, 0x0, "Transaction Instance Identifier", HFILL}},
-        {&hf_mq_iih_transstate, {"TransactState.", "mq.iih.transstate", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction State", HFILL}},
+        {&hf_mq_iih_transstate, {"TransactState.", "mq.iih.transstate", FT_STRING, BASE_NONE, NULL, 0x0, "Transaction State", HFILL}},
-        {&hf_mq_iih_commimode, {"Commit Mode...", "mq.iih.commimode", FT_STRING, STR_UNICODE, NULL, 0x0, "Commit Mode", HFILL}},
+        {&hf_mq_iih_commimode, {"Commit Mode...", "mq.iih.commimode", FT_STRING, BASE_NONE, NULL, 0x0, "Commit Mode", HFILL}},
-        {&hf_mq_iih_securityscope, {"SecurityScope.", "mq.iih.securityscope", FT_STRING, STR_UNICODE, NULL, 0x0, "Security Scope", HFILL}},
+        {&hf_mq_iih_securityscope, {"SecurityScope.", "mq.iih.securityscope", FT_STRING, BASE_NONE, NULL, 0x0, "Security Scope", HFILL}},
-        {&hf_mq_iih_reserved, {"Reserved......", "mq.iih.reserved", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL}},
+        {&hf_mq_iih_reserved, {"Reserved......", "mq.iih.reserved", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved", HFILL}},
 
         {&hf_mq_cih_flags_synconret, {"SYNC_ON_RETURN", "mq.iih.flags.synconret", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCIH_SYNC_ON_RETURN, "MQ CIH Flags IGNORE_PURG", HFILL}},
         {&hf_mq_cih_flags_replywonulls, {"REPLY_WO_NULLS", "mq.iih.flags.replywonulls", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCIH_REPLY_WITHOUT_NULLS, "MQ CIH Flags REPLY_WITHOUT_NULLS", HFILL}},
@@ -4563,29 +4563,29 @@ void proto_register_mq(void)
 
         {&hf_mq_ims_ll, {"ll..", "mq.ims.ll", FT_UINT16, BASE_DEC, NULL, 0x0, "IMS ll", HFILL}},
         {&hf_mq_ims_zz, {"zz..", "mq.ims.zz", FT_UINT16, BASE_DEC, NULL, 0x0, "IMS zz", HFILL}},
-        {&hf_mq_ims_trx, {"trx.", "mq.ims.trx", FT_STRING, STR_UNICODE, NULL, 0x0, "IMS Transaction", HFILL}},
+        {&hf_mq_ims_trx, {"trx.", "mq.ims.trx", FT_STRING, BASE_NONE, NULL, 0x0, "IMS Transaction", HFILL}},
         {&hf_mq_ims_data, {"data", "mq.ims.data", FT_BYTES, BASE_NONE, NULL, 0x0, "Transaction Instance Identifier", HFILL}},
 
-        {&hf_mq_tm_StructID, {"Structid", "mq.tm.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "TM structid", HFILL}},
+        {&hf_mq_tm_StructID, {"Structid", "mq.tm.structid", FT_STRING, BASE_NONE, NULL, 0x0, "TM structid", HFILL}},
         {&hf_mq_tm_version, {"version.", "mq.tm.version", FT_UINT32, BASE_DEC, NULL, 0x0, "TM version", HFILL}},
-        {&hf_mq_tm_QName, {"QName...", "mq.tm.qname", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Queue Name", HFILL}},
+        {&hf_mq_tm_QName, {"QName...", "mq.tm.qname", FT_STRING, BASE_NONE, NULL, 0x0, "TM Queue Name", HFILL}},
-        {&hf_mq_tm_ProcessNme, {"ProcName", "mq.tm.procname", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Process Name", HFILL}},
+        {&hf_mq_tm_ProcessNme, {"ProcName", "mq.tm.procname", FT_STRING, BASE_NONE, NULL, 0x0, "TM Process Name", HFILL}},
-        {&hf_mq_tm_TriggerData, {"TrigData", "mq.tm.triggerdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Trigger Data", HFILL}},
+        {&hf_mq_tm_TriggerData, {"TrigData", "mq.tm.triggerdata", FT_STRING, BASE_NONE, NULL, 0x0, "TM Trigger Data", HFILL}},
         {&hf_mq_tm_ApplType, {"ApplType", "mq.tm.appltype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "TM Application Type", HFILL}},
-        {&hf_mq_tm_ApplId, {"ApplId..", "mq.tm.applid", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Application ID", HFILL}},
+        {&hf_mq_tm_ApplId, {"ApplId..", "mq.tm.applid", FT_STRING, BASE_NONE, NULL, 0x0, "TM Application ID", HFILL}},
-        {&hf_mq_tm_EnvData, {"EnvData.", "mq.tm.envdaqta", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Environment Data", HFILL}},
+        {&hf_mq_tm_EnvData, {"EnvData.", "mq.tm.envdaqta", FT_STRING, BASE_NONE, NULL, 0x0, "TM Environment Data", HFILL}},
-        {&hf_mq_tm_UserData, {"UserData.", "mq.t2.userdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TM User Data", HFILL}},
+        {&hf_mq_tm_UserData, {"UserData.", "mq.t2.userdata", FT_STRING, BASE_NONE, NULL, 0x0, "TM User Data", HFILL}},
 
-        {&hf_mq_tmc2_StructID, {"Structid", "mq.tmc2.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 structid", HFILL}},
+        {&hf_mq_tmc2_StructID, {"Structid", "mq.tmc2.structid", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 structid", HFILL}},
-        {&hf_mq_tmc2_version, {"version.", "mq.tmc2.version", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 version", HFILL}},
+        {&hf_mq_tmc2_version, {"version.", "mq.tmc2.version", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 version", HFILL}},
-        {&hf_mq_tmc2_QName, {"QName...", "mq.tmc2.qname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Queue Name", HFILL}},
+        {&hf_mq_tmc2_QName, {"QName...", "mq.tmc2.qname", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Queue Name", HFILL}},
-        {&hf_mq_tmc2_ProcessNme, {"ProcName", "mq.tmc2.procname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Process Name", HFILL}},
+        {&hf_mq_tmc2_ProcessNme, {"ProcName", "mq.tmc2.procname", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Process Name", HFILL}},
-        {&hf_mq_tmc2_TriggerData, {"TrigData", "mq.tmc2.triggerdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Trigger Data", HFILL}},
+        {&hf_mq_tmc2_TriggerData, {"TrigData", "mq.tmc2.triggerdata", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Trigger Data", HFILL}},
-        {&hf_mq_tmc2_ApplType, {"ApplType", "mq.tmc2.appltype", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Application Type", HFILL}},
+        {&hf_mq_tmc2_ApplType, {"ApplType", "mq.tmc2.appltype", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Application Type", HFILL}},
-        {&hf_mq_tmc2_ApplId, {"ApplId..", "mq.tmc2.applid", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Application ID", HFILL}},
+        {&hf_mq_tmc2_ApplId, {"ApplId..", "mq.tmc2.applid", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Application ID", HFILL}},
-        {&hf_mq_tmc2_EnvData, {"EnvData.", "mq.tmc2.envdaqta", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Environment Data", HFILL}},
+        {&hf_mq_tmc2_EnvData, {"EnvData.", "mq.tmc2.envdaqta", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Environment Data", HFILL}},
-        {&hf_mq_tmc2_UserData, {"UserData", "mq.tmc2.userdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 User Data", HFILL}},
+        {&hf_mq_tmc2_UserData, {"UserData", "mq.tmc2.userdata", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 User Data", HFILL}},
-        {&hf_mq_tmc2_QMgrName, {"QMgrName", "mq.tmc2.qmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Queue Manager Name", HFILL}},
+        {&hf_mq_tmc2_QMgrName, {"QMgrName", "mq.tmc2.qmgrname", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Queue Manager Name", HFILL}},
 
         {&hf_mq_cih_returncode, {"ReturnCode...", "mq.cih.returncode", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Return Code", HFILL}},
         {&hf_mq_cih_compcode, {"ComplCode....", "mq.cih.compcode", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Completion Code", HFILL}},
@@ -4599,33 +4599,33 @@ void proto_register_mq(void)
         {&hf_mq_cih_converstask, {"ConversTask..", "mq.cih.converstask", FT_UINT32, BASE_DEC, VALS(GET_VALSV(ConvTaskOpt)), 0x0, "Conversational Task", HFILL}},
         {&hf_mq_cih_taskendstatus, {"TaskEndStatus", "mq.cih.taskendstatus", FT_UINT32, BASE_DEC, VALS(GET_VALSV(TaskEndStatus)), 0x0, "Status at End of Task", HFILL}},
         {&hf_mq_cih_bridgefactokn, {"BridgeFacTokn", "mq.cih.bridgefactokn", FT_BYTES, BASE_NONE, NULL, 0x0, "Bridge facility token", HFILL}},
-        {&hf_mq_cih_function, {"Function.....", "mq.cih.function", FT_STRING, STR_UNICODE, NULL, 0x0, "MQ call name or CICS EIBFN function", HFILL}},
+        {&hf_mq_cih_function, {"Function.....", "mq.cih.function", FT_STRING, BASE_NONE, NULL, 0x0, "MQ call name or CICS EIBFN function", HFILL}},
-        {&hf_mq_cih_abendcode, {"AbendCode....", "mq.cih.abendcode", FT_STRING, STR_UNICODE, NULL, 0x0, "Abend Code", HFILL}},
+        {&hf_mq_cih_abendcode, {"AbendCode....", "mq.cih.abendcode", FT_STRING, BASE_NONE, NULL, 0x0, "Abend Code", HFILL}},
-        {&hf_mq_cih_authenticator, {"Authenticator", "mq.cih.authenticator", FT_STRING, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL}},
+        {&hf_mq_cih_authenticator, {"Authenticator", "mq.cih.authenticator", FT_STRING, BASE_NONE, NULL, 0x0, "Password or Passcode", HFILL}},
-        {&hf_mq_cih_reserved, {"Reserved.....", "mq.cih.reserved", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL}},
+        {&hf_mq_cih_reserved, {"Reserved.....", "mq.cih.reserved", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved", HFILL}},
-        {&hf_mq_cih_replytofmt, {"ReplyToFormat", "mq.cih.replytofmt", FT_STRING, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL}},
+        {&hf_mq_cih_replytofmt, {"ReplyToFormat", "mq.cih.replytofmt", FT_STRING, BASE_NONE, NULL, 0x0, "Reply To Format", HFILL}},
-        {&hf_mq_cih_remotesysid, {"RemoteSysId..", "mq.cih.remotesysid", FT_STRING, STR_UNICODE, NULL, 0x0, "Remote System Id", HFILL}},
+        {&hf_mq_cih_remotesysid, {"RemoteSysId..", "mq.cih.remotesysid", FT_STRING, BASE_NONE, NULL, 0x0, "Remote System Id", HFILL}},
-        {&hf_mq_cih_remotetransid, {"RemoteTransId", "mq.cih.remotetransid", FT_STRING, STR_UNICODE, NULL, 0x0, "Remote Transaction Id", HFILL}},
+        {&hf_mq_cih_remotetransid, {"RemoteTransId", "mq.cih.remotetransid", FT_STRING, BASE_NONE, NULL, 0x0, "Remote Transaction Id", HFILL}},
-        {&hf_mq_cih_transactionid, {"TransactionId", "mq.cih.transactionid", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction to attach", HFILL}},
+        {&hf_mq_cih_transactionid, {"TransactionId", "mq.cih.transactionid", FT_STRING, BASE_NONE, NULL, 0x0, "Transaction to attach", HFILL}},
-        {&hf_mq_cih_facilitylike, {"FacilityLike.", "mq.cih.facilitylike", FT_STRING, STR_UNICODE, NULL, 0x0, "Terminal emulated attributes", HFILL}},
+        {&hf_mq_cih_facilitylike, {"FacilityLike.", "mq.cih.facilitylike", FT_STRING, BASE_NONE, NULL, 0x0, "Terminal emulated attributes", HFILL}},
-        {&hf_mq_cih_attentionid, {"AttentionID..", "mq.cih.attentionid", FT_STRING, STR_UNICODE, NULL, 0x0, "Attention Id (AID) Key", HFILL}},
+        {&hf_mq_cih_attentionid, {"AttentionID..", "mq.cih.attentionid", FT_STRING, BASE_NONE, NULL, 0x0, "Attention Id (AID) Key", HFILL}},
-        {&hf_mq_cih_startcode, {"StartCode....", "mq.cih.startcode", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction Start Code", HFILL}},
+        {&hf_mq_cih_startcode, {"StartCode....", "mq.cih.startcode", FT_STRING, BASE_NONE, NULL, 0x0, "Transaction Start Code", HFILL}},
-        {&hf_mq_cih_cancelcode, {"CancelCode...", "mq.cih.cancelcode", FT_STRING, STR_UNICODE, NULL, 0x0, "Abend transaction code", HFILL}},
+        {&hf_mq_cih_cancelcode, {"CancelCode...", "mq.cih.cancelcode", FT_STRING, BASE_NONE, NULL, 0x0, "Abend transaction code", HFILL}},
-        {&hf_mq_cih_nexttransid, {"NextTransId..", "mq.cih.nexttransid", FT_STRING, STR_UNICODE, NULL, 0x0, "Next transaction to attach", HFILL}},
+        {&hf_mq_cih_nexttransid, {"NextTransId..", "mq.cih.nexttransid", FT_STRING, BASE_NONE, NULL, 0x0, "Next transaction to attach", HFILL}},
-        {&hf_mq_cih_reserved2, {"Reserved3....", "mq.cih.reserved2", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 2", HFILL}},
+        {&hf_mq_cih_reserved2, {"Reserved3....", "mq.cih.reserved2", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved 2", HFILL}},
-        {&hf_mq_cih_reserved3, {"Reserved3....", "mq.cih.reserved3", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 3", HFILL}},
+        {&hf_mq_cih_reserved3, {"Reserved3....", "mq.cih.reserved3", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved 3", HFILL}},
         {&hf_mq_cih_cursorpos, {"CursorPos....", "mq.cih.cursorpos", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Cursor Posiution", HFILL}},
         {&hf_mq_cih_erroroffset, {"ErrorOffset..", "mq.cih.erroroffset", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Offset of error in message", HFILL}},
         {&hf_mq_cih_inputitem, {"InputItem....", "mq.cih.inputitem", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Input Item", HFILL}},
-        {&hf_mq_cih_reserved4, {"Reserved4....", "mq.cih.reserved4", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 4", HFILL}},
+        {&hf_mq_cih_reserved4, {"Reserved4....", "mq.cih.reserved4", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved 4", HFILL}},
 
         {&hf_mq_rfh_ccsid, {"NmeValCCSID", "mq.rfh.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "RFH NameValue CCSID", HFILL}},
         {&hf_mq_rfh_length, {"Len.", "mq.rfh.length", FT_UINT32, BASE_DEC, NULL, 0x0, "RFH NameValue Length", HFILL}},
-        {&hf_mq_rfh_string, {"Val.", "mq.rfh.string", FT_STRING, STR_UNICODE, NULL, 0x0, "RFH NameValue", HFILL}},
+        {&hf_mq_rfh_string, {"Val.", "mq.rfh.string", FT_STRING, BASE_NONE, NULL, 0x0, "RFH NameValue", HFILL}},
 
         {&hf_mq_rmh_flags_last, {"LAST", "mq.rmh.flags.last", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQRMHF_LAST, "MQ RMH LAST", HFILL}},
 
-        {&hf_mq_rmh_objecttype, {"ObjectType...", "mq.rmh.objecttype", FT_STRING, STR_UNICODE, NULL, 0x0, "Object Type", HFILL}},
+        {&hf_mq_rmh_objecttype, {"ObjectType...", "mq.rmh.objecttype", FT_STRING, BASE_NONE, NULL, 0x0, "Object Type", HFILL}},
         {&hf_mq_rmh_objectinstid, {"ObjectInstId.", "mq.rmh.objectinstid", FT_BYTES, BASE_NONE, NULL, 0x0, "Object Instance Identifier", HFILL}},
         {&hf_mq_rmh_srcenvlen, {"SrcEnvLen....", "mq.rmh.srcenvlen", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of source environment data", HFILL}},
         {&hf_mq_rmh_srcenvofs, {"SrcEnvOfs....", "mq.rmh.srcenvofs", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Offset of source environment data", HFILL}},
@@ -4639,10 +4639,10 @@ void proto_register_mq(void)
         {&hf_mq_rmh_datalogicofsl, {"DataLogicOfsL", "mq.rmh.datalogicofsl", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Low offset of bulk data", HFILL}},
         {&hf_mq_rmh_datalogicofsh, {"DataLogicOfsH", "mq.rmh.datalogicofsh", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "High offset of bulk data", HFILL}},
 
-        {&hf_mq_wih_servicename, {"ServiceName..", "mq.wih.servicename", FT_STRING, STR_UNICODE, NULL, 0x0, "Service Name", HFILL}},
+        {&hf_mq_wih_servicename, {"ServiceName..", "mq.wih.servicename", FT_STRING, BASE_NONE, NULL, 0x0, "Service Name", HFILL}},
-        {&hf_mq_wih_servicestep, {"ServiceStep..", "mq.wih.servicestep", FT_STRING, STR_UNICODE, NULL, 0x0, "Service Step Name", HFILL}},
+        {&hf_mq_wih_servicestep, {"ServiceStep..", "mq.wih.servicestep", FT_STRING, BASE_NONE, NULL, 0x0, "Service Step Name", HFILL}},
         {&hf_mq_wih_msgtoken, {"MsgToken.....", "mq.wih.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "Message Token", HFILL}},
-        {&hf_mq_wih_reserved, {"Reserved.....", "mq.wih.reserved", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL}},
+        {&hf_mq_wih_reserved, {"Reserved.....", "mq.wih.reserved", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved", HFILL}},
     };
 
     static gint* ett[] =

epan/dissectors/packet-nano.c

@@ -858,7 +858,7 @@ void proto_register_nano(void)
     static hf_register_info hf[] = {
         { &hf_nano_magic_number,
           { "Magic Number", "nano.magic_number",
-            FT_STRING, STR_ASCII, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             "Nano Protocol Magic Number", HFILL }
         },
         { &hf_nano_version_max,

epan/dissectors/packet-nas_5gs.c

@@ -10788,7 +10788,7 @@ proto_register_nas_5gs(void)
         },
         { &hf_nas_5gs_sm_dm_spec_id,
         { "DN-specific identity",   "nas_5gs.sm.dm_spec_id",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
+            FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_nas_5gs_sm_all_ssc_mode_b0,

epan/dissectors/packet-nas_eps.c

@@ -7426,7 +7426,7 @@ proto_register_nas_eps(void)
     },
     { &hf_eps_emm_ext_emerg_num_list_emerg_num,
         { "Emergency number","nas_eps.emm.ext_emerg_num_list.emerg_num",
-        FT_STRING, STR_ASCII, NULL, 0x0,
+        FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_eps_emm_ext_emerg_num_list_sub_serv_field_len,
@@ -7436,7 +7436,7 @@ proto_register_nas_eps(void)
     },
     { &hf_eps_emm_ext_emerg_num_list_sub_serv_field,
         { "Sub-services field","nas_eps.emm.ext_emerg_num_list.sub_serv_field",
-        FT_STRING, STR_UNICODE, NULL, 0x0,
+        FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_nas_eps_emm_prose_dd_cap,

epan/dissectors/packet-netlink-generic.c

@@ -214,7 +214,7 @@ dissect_genl_ctrl_ops_attrs(tvbuff_t *tvb, void *data _U_, struct packet_netlink
 
 
 static header_field_info hfi_genl_ctrl_group_name NETLINK_GENERIC_HFI_INIT =
-	{ "Group Name", "genl.ctrl.group_name", FT_STRINGZ, STR_ASCII,
+	{ "Group Name", "genl.ctrl.group_name", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_genl_ctrl_group_id NETLINK_GENERIC_HFI_INIT =
@@ -257,7 +257,7 @@ static header_field_info hfi_genl_ctrl_family_id NETLINK_GENERIC_HFI_INIT =
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_genl_ctrl_family_name NETLINK_GENERIC_HFI_INIT =
-	{ "Family Name", "genl.ctrl.family_name", FT_STRINGZ, STR_ASCII,
+	{ "Family Name", "genl.ctrl.family_name", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_genl_ctrl_version NETLINK_GENERIC_HFI_INIT =

epan/dissectors/packet-netlink-net_dm.c

@@ -198,7 +198,7 @@ static header_field_info hfi_net_dm_pc NETLINK_NET_DM_HFI_INIT =
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_net_dm_symbol NETLINK_NET_DM_HFI_INIT =
-	{ "Symbol", "net_dm.symbol", FT_STRINGZ, STR_ASCII,
+	{ "Symbol", "net_dm.symbol", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_net_dm_attrs_port NETLINK_NET_DM_HFI_INIT =
@@ -235,11 +235,11 @@ static header_field_info hfi_net_dm_origin NETLINK_NET_DM_HFI_INIT =
 
 static header_field_info hfi_net_dm_hw_trap_group_name NETLINK_NET_DM_HFI_INIT =
 	{ "Hardware trap group name", "net_dm.hw_trap_group_name", FT_STRINGZ,
-	  STR_ASCII, NULL, 0x00, NULL, HFILL };
+	  BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_net_dm_hw_trap_name NETLINK_NET_DM_HFI_INIT =
 	{ "Hardware trap name", "net_dm.hw_trap_name", FT_STRINGZ,
-	  STR_ASCII, NULL, 0x00, NULL, HFILL };
+	  BASE_NONE, NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_net_dm_hw_trap_count NETLINK_NET_DM_HFI_INIT =
 	{ "Hardware trap count", "net_dm.hw_trap_count", FT_UINT32, BASE_DEC,
@@ -258,7 +258,7 @@ static header_field_info hfi_net_dm_port_netdev_index NETLINK_NET_DM_HFI_INIT =
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_net_dm_port_netdev_name NETLINK_NET_DM_HFI_INIT =
-	{ "Port net device name", "net_dm.port.netdev_name", FT_STRINGZ, STR_ASCII,
+	{ "Port net device name", "net_dm.port.netdev_name", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_net_dm_stats_dropped NETLINK_NET_DM_HFI_INIT =

epan/dissectors/packet-netlink-netfilter.c

@@ -708,7 +708,7 @@ static header_field_info hfi_nfct_attr_status NETLINK_NETFILTER_HFI_INIT =
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nfct_help_attr_help_name NETLINK_NETFILTER_HFI_INIT =
-	{ "Helper name", "netlink-netfilter.ct_help_attr.help_name", FT_STRINGZ, STR_UNICODE,
+	{ "Helper name", "netlink-netfilter.ct_help_attr.help_name", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_nfct_help_attr NETLINK_NETFILTER_HFI_INIT =
@@ -917,7 +917,7 @@ static header_field_info hfi_nfexp_attr_zone NETLINK_NETFILTER_HFI_INIT =
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nfexp_attr_fn NETLINK_NETFILTER_HFI_INIT =
-	{ "Name", "netlink-netfilter.nfexp.fn", FT_STRINGZ, STR_UNICODE,
+	{ "Name", "netlink-netfilter.nfexp.fn", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x0, NULL, HFILL };
 
 /* CTA_EXPECT_FLAGS bitfield */
@@ -1610,11 +1610,11 @@ static header_field_info hfi_ipset_cadt_attr_cadt_flags NETLINK_NETFILTER_HFI_IN
 	  NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_ipset_attr_setname NETLINK_NETFILTER_HFI_INIT =
-	{ "Setname", "netlink-netfilter.ipset.setname", FT_STRINGZ, STR_UNICODE,
+	{ "Setname", "netlink-netfilter.ipset.setname", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_ipset_attr_typename NETLINK_NETFILTER_HFI_INIT =
-	{ "Typename", "netlink-netfilter.ipset.typename", FT_STRINGZ, STR_UNICODE,
+	{ "Typename", "netlink-netfilter.ipset.typename", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_ipset_attr_family NETLINK_NETFILTER_HFI_INIT =
@@ -1630,7 +1630,7 @@ static header_field_info hfi_ipset_adt_attr NETLINK_NETFILTER_HFI_INIT =
 	  VALS(ipset_adt_attr_vals), NLA_TYPE_MASK, NULL, HFILL };
 
 static header_field_info hfi_ipset_adt_attr_comment NETLINK_NETFILTER_HFI_INIT =
-	{ "Comment", "netlink-netfilter.ipset.comment", FT_STRINGZ, STR_UNICODE,
+	{ "Comment", "netlink-netfilter.ipset.comment", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_ipset_ip_attr NETLINK_NETFILTER_HFI_INIT =

epan/dissectors/packet-netlink-nl80211.c

@@ -3714,11 +3714,11 @@ static header_field_info hfi_nl80211_attr_value64 NETLINK_NL80211_HFI_INIT =
       NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_wiphy_name NETLINK_NL80211_HFI_INIT =
-    { "Wiphy Name", "nl80211.wiphy_name", FT_STRINGZ, STR_ASCII,
+    { "Wiphy Name", "nl80211.wiphy_name", FT_STRINGZ, BASE_NONE,
       NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_ifname NETLINK_NL80211_HFI_INIT =
-    { "Interface Name", "nl80211.ifname", FT_STRINGZ, STR_ASCII,
+    { "Interface Name", "nl80211.ifname", FT_STRINGZ, BASE_NONE,
       NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_mac NETLINK_NL80211_HFI_INIT =
@@ -3726,7 +3726,7 @@ static header_field_info hfi_nl80211_mac NETLINK_NL80211_HFI_INIT =
       NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_alpha2 NETLINK_NL80211_HFI_INIT =
-    { "Alpha2", "nl80211.alpha2", FT_STRINGZ, STR_ASCII,
+    { "Alpha2", "nl80211.alpha2", FT_STRINGZ, BASE_NONE,
       NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_dbm NETLINK_NL80211_HFI_INIT =

epan/dissectors/packet-netlink-route.c

@@ -592,7 +592,7 @@ static header_field_info hfi_netlink_route_ifla_attr_type NETLINK_ROUTE_HFI_INIT
 	  VALS(netlink_route_ifla_attr_vals), 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifla_ifname NETLINK_ROUTE_HFI_INIT =
-	{ "Device name", "netlink-route.ifla_ifname", FT_STRINGZ, STR_ASCII,
+	{ "Device name", "netlink-route.ifla_ifname", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifla_mtu NETLINK_ROUTE_HFI_INIT =
@@ -636,7 +636,7 @@ static header_field_info hfi_netlink_route_ifla_carrier NETLINK_ROUTE_HFI_INIT =
 	  TFS(&tfs_restricted_not_restricted), 0x01, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifla_qdisc NETLINK_ROUTE_HFI_INIT =
-	{ "Queueing discipline", "netlink-route.ifla_qdisc", FT_STRINGZ, STR_ASCII,
+	{ "Queueing discipline", "netlink-route.ifla_qdisc", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifla_carrier_changes NETLINK_ROUTE_HFI_INIT =
@@ -1045,7 +1045,7 @@ static header_field_info hfi_netlink_route_ifa_attr_type NETLINK_ROUTE_HFI_INIT
 	  VALS(netlink_route_ifa_attr_vals), 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifa_label NETLINK_ROUTE_HFI_INIT =
-	{ "Interface name", "netlink-route.ifa_label", FT_STRINGZ, STR_ASCII,
+	{ "Interface name", "netlink-route.ifa_label", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifa_flags32 NETLINK_ROUTE_HFI_INIT =

epan/dissectors/packet-netlink-sock_diag.c

@@ -358,7 +358,7 @@ static header_field_info hfi_netlink_sock_diag_unix_attr NETLINK_SOCK_DIAG_HFI_I
 	  VALS(netlink_sock_diag_unix_attr_vals), NLA_TYPE_MASK, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_name NETLINK_SOCK_DIAG_HFI_INIT =
-	{ "Name", "netlink-sock_diag.unix_name", FT_STRINGZ, STR_ASCII,
+	{ "Name", "netlink-sock_diag.unix_name", FT_STRINGZ, BASE_NONE,
 	  NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_peer_inode NETLINK_SOCK_DIAG_HFI_INIT =