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.

1 files changed, 11 insertions, 11 deletions

diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index c7ef7768fd..ee3b893012 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/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",