diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 15:17:27 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 22:17:56 +0000 |
| commit | 0a9a2554a46ce4e040dba669a3ed22f0e9ab709e (patch) | |
| tree | 931067907b96dc2f2ad7bf815f28aad90f6a0f6b /epan/dissectors/packet-pvfs2.c | |
| parent | d4f6480253cf303f70c3d831098adf7582403b8f (diff) | |
Remove more deprecated tvb_length calls
Change-Id: Ie137e6f4e20fe26b1a4d9510e267896219c1c631
Reviewed-on: https://code.wireshark.org/review/9075
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-pvfs2.c')
| -rw-r--r-- | epan/dissectors/packet-pvfs2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 16b55bc15e..40fcc802dc 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -816,7 +816,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, string_length += 1; } - string_length_captured = tvb_length_remaining(tvb, data_offset); + string_length_captured = tvb_captured_length_remaining(tvb, data_offset); string_length_packet = tvb_reported_length_remaining(tvb, data_offset); /* @@ -850,7 +850,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, else fill_length = string_length_full - string_length - 4; - fill_length_captured = tvb_length_remaining(tvb, + fill_length_captured = tvb_captured_length_remaining(tvb, data_offset + string_length); fill_length_packet = tvb_reported_length_remaining(tvb, data_offset + string_length); @@ -1507,7 +1507,7 @@ dissect_pvfs2_io_request(tvbuff_t *tvb, proto_tree *tree, int offset, /*offset = */dissect_pvfs_pint_request(tvb, tree, offset); /* TODO: remove this!!! */ - offset = tvb_length(tvb) - 16; + offset = tvb_reported_length(tvb) - 16; /* offset */ proto_tree_add_item(tree, hf_pvfs_offset, tvb, offset, 8, ENC_LITTLE_ENDIAN); @@ -2334,7 +2334,7 @@ dissect_pvfs2_getconfig_response(tvbuff_t *tvb, proto_tree *parent_tree, ptr = tvb_get_ptr(tvb, offset, total_config_bytes); /* Check if all data is available */ - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_captured_length_remaining(tvb, offset); if (length_remaining < total_config_bytes) { |