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-dvbci.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-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index a4448c8500..b4fcee3ecf 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -3610,8 +3610,8 @@ dissect_dvbci_ami_file_ack(tvbuff_t *tvb, gint offset, proto_tree_add_text(tree, tvb, offset, 1, "File name length %d", file_name_len); offset++; - file_name_str = tvb_get_string(wmem_packet_scope(), - tvb, offset, file_name_len); + file_name_str = tvb_get_string_enc(wmem_packet_scope(), + tvb, offset, file_name_len, ENC_ASCII); if (!file_name_str) return; col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", @@ -3696,7 +3696,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, offset++; proto_tree_add_item(tree, hf_dvbci_app_dom_id, tvb, offset, app_dom_id_len, ENC_ASCII|ENC_NA); - app_dom_id = tvb_get_string(wmem_packet_scope(), tvb, offset, app_dom_id_len); + app_dom_id = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, app_dom_id_len, ENC_ASCII); if (app_dom_id) { col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "for %s", app_dom_id); @@ -3726,8 +3726,8 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, if (tvb_reported_length_remaining(tvb, offset) <= 0) break; if (req_type==REQ_TYPE_FILE || req_type==REQ_TYPE_FILE_HASH) { - req_str = tvb_get_string(wmem_packet_scope(), tvb, offset, - tvb_reported_length_remaining(tvb, offset)); + req_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, + tvb_reported_length_remaining(tvb, offset), ENC_ASCII); if (!req_str) break; col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "%s", req_str); |