diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-07 15:48:35 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-07 15:48:35 +0000 |
| commit | 7ab18667e5062785e4de683b420a5bbcf3136102 (patch) | |
| tree | 96e80e37ef0ae10c5e66116a11e0fb46bfd2600a /epan/dissectors/packet-json.c | |
| parent | 0e5bc8a49c4778ffabf930ad325fef0321853e88 (diff) | |
| download | wireshark-7ab18667e5062785e4de683b420a5bbcf3136102.tar.gz wireshark-7ab18667e5062785e4de683b420a5bbcf3136102.tar.bz2 wireshark-7ab18667e5062785e4de683b420a5bbcf3136102.zip | |
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
Diffstat (limited to 'epan/dissectors/packet-json.c')
| -rw-r--r-- | epan/dissectors/packet-json.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |