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-nfs.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-nfs.c')
| -rw-r--r-- | epan/dissectors/packet-nfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 2340bb418a..7c682bf999 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2187,7 +2187,7 @@ dissect_fhandle_data_GLUSTER(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * if (fhlen != 36) return; - ident = tvb_get_string(NULL, tvb, offset, 4); + ident = tvb_get_string_enc(NULL, tvb, offset, 4, ENC_ASCII); if (strncmp(":OGL", ident, 4)) return; offset += 4; @@ -2371,7 +2371,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * guint8 *fh_array; proto_item *fh_item = NULL; - fh_array = tvb_get_string(NULL, tvb, offset, fhlen); + fh_array = tvb_get_string_enc(NULL, tvb, offset, fhlen, ENC_ASCII); fhhash = crc32_ccitt(fh_array, fhlen); g_free(fh_array); @@ -8028,7 +8028,7 @@ dissect_nfs4_stateid(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 *hash) newftree = proto_item_add_subtree(fitem, ett_nfs4_stateid); } - sidh_array = tvb_get_string(NULL, tvb, offset, 16); + sidh_array = tvb_get_string_enc(NULL, tvb, offset, 16, ENC_ASCII); sid_hash = crc16_ccitt(sidh_array, 16); g_free(sidh_array); @@ -9233,7 +9233,7 @@ dissect_nfs4_request_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre break; case NFS4_OP_RENEW: - clientid_array = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); + clientid_array = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII); clientid_hash = crc16_ccitt(clientid_array, 8); offset = dissect_rpc_uint64(tvb, newftree, hf_nfs4_clientid, offset); g_string_append_printf (op_summary[ops_counter].optext, " CID: 0x%04x", clientid_hash); |