diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:30:58 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:13:58 +0000 |
| commit | 971ffd683ea23362bd8009567ff7860371e6e2cc (patch) | |
| tree | 28c9ada98d2e59b196fc839d39ab2448fd436968 /epan/dissectors/packet-dnp.c | |
| parent | 421d817d70737ebd459b7027274bf38bb2d9a2ff (diff) | |
Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dnp.c')
| -rw-r--r-- | epan/dissectors/packet-dnp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 2b2428be18..d915f08af6 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -1948,8 +1948,8 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, da_len = tvb_get_guint8(tvb, offset+1); proto_tree_add_item(point_tree, hf_dnp3_al_da_length, tvb, offset+1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_text(point_tree, tvb, offset+2, da_len, "Value: %s", tvb_get_string(wmem_packet_scope(), tvb, offset+2, da_len)); - proto_item_append_text(object_item, ", Value: %s", tvb_get_string(wmem_packet_scope(), tvb, offset+2, da_len)); + proto_tree_add_text(point_tree, tvb, offset+2, da_len, "Value: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, da_len, ENC_ASCII)); + proto_item_append_text(object_item, ", Value: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, da_len, ENC_ASCII)); offset += 2 + da_len; @@ -2678,7 +2678,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, if (al_filename_len > 0) { const gchar *al_filename; - al_filename = tvb_get_string(wmem_packet_scope(), tvb, data_pos, al_filename_len); + al_filename = tvb_get_string_enc(wmem_packet_scope(), tvb, data_pos, al_filename_len, ENC_ASCII); proto_tree_add_text(point_tree, tvb, data_pos, al_filename_len, "File Name: %s", al_filename); } data_pos += al_filename_len; |