diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-pvfs2.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
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 affa30c362..5d97f3ea07 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -812,7 +812,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, string_length += 1; } - string_length_captured = tvb_captured_length_remaining(tvb, data_offset); + string_length_captured = tvb_length_remaining(tvb, data_offset); string_length_packet = tvb_reported_length_remaining(tvb, data_offset); /* @@ -846,7 +846,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, else fill_length = string_length_full - string_length - 4; - fill_length_captured = tvb_captured_length_remaining(tvb, + fill_length_captured = tvb_length_remaining(tvb, data_offset + string_length); fill_length_packet = tvb_reported_length_remaining(tvb, data_offset + string_length); @@ -1535,7 +1535,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_captured_length(tvb) - 16; + offset = tvb_length(tvb) - 16; /* offset */ proto_tree_add_item(tree, hf_pvfs_offset, tvb, offset, 8, ENC_LITTLE_ENDIAN); @@ -2381,7 +2381,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_captured_length_remaining(tvb, offset); + length_remaining = tvb_length_remaining(tvb, offset); if (length_remaining < total_config_bytes) { |