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-epmd.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-epmd.c')
| -rw-r--r-- | epan/dissectors/packet-epmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index c30118c81f..000b8322f1 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -145,7 +145,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree name_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_epmd_name_len, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, name_length, ENC_ASCII); offset += 2 + name_length; if (tvb_length_remaining(tvb, offset) >= 2) { guint16 elen=0; @@ -161,7 +161,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree case EPMD_PORT2_REQ: name_length = tvb_length_remaining(tvb, offset); proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); break; case EPMD_ALIVE_REQ: @@ -169,7 +169,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree offset += 2; name_length = tvb_length_remaining(tvb, offset); proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); break; case EPMD_NAMES_REQ: @@ -248,7 +248,7 @@ dissect_epmd_response(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree name_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_epmd_name_len, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, name_length, ENC_ASCII); offset += 2 + name_length; if (tvb_length_remaining(tvb, offset) >= 2) { guint16 elen=0; |