Drop proto_tree_add_unicode_string() from IP, IPv6, JSON dissectors.

Set .display to STR_UNICODE (instead of STR_ASCII).

svn path=/trunk/; revision=53827

3 files changed, 38 insertions, 38 deletions

diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 3b858a0d55..d4ca29f884 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -589,10 +589,10 @@ add_geoip_info_entry(proto_item *geoip_info_item, tvbuff_t *tvb, gint offset, gu
         PROTO_ITEM_SET_GENERATED(item);
         PROTO_ITEM_SET_HIDDEN(item);
       } else {
-        item = proto_tree_add_unicode_string(geoip_info_tree, geoip_local_hf,
+        item = proto_tree_add_string(geoip_info_tree, geoip_local_hf,
           tvb, offset, 4, geoip_str);
         PROTO_ITEM_SET_GENERATED(item);
-        item = proto_tree_add_unicode_string(geoip_info_tree, geoip_hf,
+        item = proto_tree_add_string(geoip_info_tree, geoip_hf,
           tvb, offset, 4, geoip_str);
         PROTO_ITEM_SET_GENERATED(item);
         PROTO_ITEM_SET_HIDDEN(item);
@@ -2595,40 +2595,40 @@ proto_register_ip(void)
 #ifdef HAVE_GEOIP
     { &hf_geoip_country,
       { "Source or Destination GeoIP Country", "ip.geoip.country",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_city,
       { "Source or Destination GeoIP City", "ip.geoip.city",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_org,
       { "Source or Destination GeoIP Organization", "ip.geoip.org",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_isp,
       { "Source or Destination GeoIP ISP", "ip.geoip.isp",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_asnum,
       { "Source or Destination GeoIP AS Number", "ip.geoip.asnum",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_lat,
       { "Source or Destination GeoIP Latitude", "ip.geoip.lat",
-        FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_DOUBLE, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_lon,
       { "Source or Destination GeoIP Longitude", "ip.geoip.lon",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_country,
       { "Source GeoIP Country", "ip.geoip.src_country",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_city,
       { "Source GeoIP City", "ip.geoip.src_city",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_org,
       { "Source GeoIP Organization", "ip.geoip.src_org",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_isp,
       { "Source GeoIP ISP", "ip.geoip.src_isp",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_asnum,
       { "Source GeoIP AS Number", "ip.geoip.src_asnum",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_lat,
       { "Source GeoIP Latitude", "ip.geoip.src_lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -2637,19 +2637,19 @@ proto_register_ip(void)
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_country,
       { "Destination GeoIP Country", "ip.geoip.dst_country",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_city,
       { "Destination GeoIP City", "ip.geoip.dst_city",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_org,
       { "Destination GeoIP Organization", "ip.geoip.dst_org",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_isp,
       { "Destination GeoIP ISP", "ip.geoip.dst_isp",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_asnum,
       { "Destination GeoIP AS Number", "ip.geoip.dst_asnum",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_lat,
       { "Destination GeoIP Latitude", "ip.geoip.dst_lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 1e3245b2e9..2a2244b616 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -594,10 +594,10 @@ add_geoip_info_entry(proto_tree *geoip_info_item, tvbuff_t *tvb, gint offset, co
         PROTO_ITEM_SET_GENERATED(item);
         PROTO_ITEM_SET_HIDDEN(item);
       } else {
-        item = proto_tree_add_unicode_string(geoip_info_tree, geoip_local_hf, tvb,
+        item = proto_tree_add_string(geoip_info_tree, geoip_local_hf, tvb,
           offset, 16, geoip_str);
         PROTO_ITEM_SET_GENERATED(item);
-        item  = proto_tree_add_unicode_string(geoip_info_tree, geoip_hf, tvb,
+        item  = proto_tree_add_string(geoip_info_tree, geoip_hf, tvb,
           offset, 16, geoip_str);
         PROTO_ITEM_SET_GENERATED(item);
         PROTO_ITEM_SET_HIDDEN(item);
@@ -2311,23 +2311,23 @@ proto_register_ipv6(void)
 #ifdef HAVE_GEOIP_V6
     { &hf_geoip_country,
       { "Source or Destination GeoIP Country", "ipv6.geoip.country",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_city,
       { "Source or Destination GeoIP City", "ipv6.geoip.city",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_org,
       { "Source or Destination GeoIP Organization", "ipv6.geoip.org",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_isp,
       { "Source or Destination GeoIP ISP", "ipv6.geoip.isp",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_asnum,
       { "Source or Destination GeoIP AS Number", "ipv6.geoip.asnum",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_lat,
       { "Source or Destination GeoIP Latitude", "ipv6.geoip.lat",
@@ -2339,23 +2339,23 @@ proto_register_ipv6(void)
                                 NULL, HFILL }},
     { &hf_geoip_src_country,
       { "Source GeoIP Country", "ipv6.geoip.src_country",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_src_city,
       { "Source GeoIP City", "ipv6.geoip.src_city",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_src_org,
       { "Source GeoIP Organization", "ipv6.geoip.src_org",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_src_isp,
       { "Source GeoIP ISP", "ipv6.geoip.src_isp",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_src_asnum,
       { "Source GeoIP AS Number", "ipv6.geoip.src_asnum",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_src_lat,
       { "Source GeoIP Latitude", "ipv6.geoip.src_lat",
@@ -2363,27 +2363,27 @@ proto_register_ipv6(void)
                                 NULL, HFILL }},
     { &hf_geoip_src_lon,
       { "Source GeoIP Longitude", "ipv6.geoip.src_lon",
-                                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                                FT_DOUBLE, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_dst_country,
       { "Destination GeoIP Country", "ipv6.geoip.dst_country",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_dst_city,
       { "Destination GeoIP City", "ipv6.geoip.dst_city",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_dst_org,
       { "Destination GeoIP Organization", "ipv6.geoip.dst_org",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_dst_isp,
       { "Destination GeoIP ISP", "ipv6.geoip.dst_isp",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_dst_asnum,
       { "Destination GeoIP AS Number", "ipv6.geoip.dst_asnum",
-                                FT_STRING, BASE_NONE, NULL, 0x0,
+                                FT_STRING, STR_UNICODE, NULL, 0x0,
                                 NULL, HFILL }},
     { &hf_geoip_dst_lat,
       { "Destination GeoIP Latitude", "ipv6.geoip.dst_lat",
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c
index d04a839d8e..6b90589910 100644
--- a/epan/dissectors/packet-json.c
+++ b/epan/dissectors/packet-json.c
@@ -64,7 +64,7 @@ static header_field_info hfi_json_member_key JSON_HFI_INIT =
 #endif
 
 static header_field_info hfi_json_value_string JSON_HFI_INIT = /* FT_STRINGZ? */
-	{ "String value", "json.value.string", FT_STRING, BASE_NONE, NULL, 0x00, "JSON string value", HFILL };
+	{ "String value", "json.value.string", FT_STRING, STR_UNICODE, 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 };
@@ -393,7 +393,7 @@ static void after_value(void *tvbparse_data, const void *wanted_data _U_, tvbpar
 	switch (value_id) {
 		case JSON_TOKEN_STRING:
 			if (tok->len >= 2)
-				proto_tree_add_unicode_string(tree, hfi_json_value_string.id, tok->tvb, tok->offset, tok->len, json_string_unescape(tok));
+				proto_tree_add_string(tree, &hfi_json_value_string, tok->tvb, tok->offset, tok->len, json_string_unescape(tok));
 			else
 				proto_tree_add_item(tree, &hfi_json_value_string, tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA);
 			break;