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-collectd.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-collectd.c')
| -rw-r--r-- | epan/dissectors/packet-collectd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 040384aefd..843c4b7992 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -395,7 +395,7 @@ dissect_collectd_string (tvbuff_t *tvb, packet_info *pinfo, gint type_hf, *ret_offset = offset + 4; *ret_length = length - 4; - *ret_string = tvb_get_string (wmem_packet_scope(), tvb, *ret_offset, *ret_length); + *ret_string = tvb_get_string_enc(wmem_packet_scope(), tvb, *ret_offset, *ret_length, ENC_ASCII); pi = proto_tree_add_text (tree_root, tvb, offset, length, "collectd %s segment: \"%s\"", @@ -1007,8 +1007,8 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (part_type) { case TYPE_HOST: - vdispatch.host = tvb_get_string (wmem_packet_scope(), tvb, - offset + 4, part_length - 4); + vdispatch.host = tvb_get_string_enc(wmem_packet_scope(), tvb, + offset + 4, part_length - 4, ENC_ASCII); if (pkt_host == NULL) pkt_host = vdispatch.host; break; @@ -1016,15 +1016,15 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TYPE_TIME_HR: break; case TYPE_PLUGIN: - vdispatch.plugin = tvb_get_string (wmem_packet_scope(), tvb, - offset + 4, part_length - 4); + vdispatch.plugin = tvb_get_string_enc(wmem_packet_scope(), tvb, + offset + 4, part_length - 4, ENC_ASCII); pkt_plugins++; break; case TYPE_PLUGIN_INSTANCE: break; case TYPE_TYPE: - vdispatch.type = tvb_get_string (wmem_packet_scope(), tvb, - offset + 4, part_length - 4); + vdispatch.type = tvb_get_string_enc(wmem_packet_scope(), tvb, + offset + 4, part_length - 4, ENC_ASCII); break; case TYPE_TYPE_INSTANCE: break; |