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-cpfi.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-cpfi.c')
-rw-r--r-- | epan/dissectors/packet-cpfi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index f88731f997..9099beb9ae 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -328,7 +328,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, void * if (pinfo->dst.type != AT_ETHER || pinfo->src.type != AT_ETHER) return 0; - length = tvb_captured_length_remaining(message_tvb, 8); + length = tvb_length_remaining(message_tvb, 8); reported_length = tvb_reported_length_remaining(message_tvb, 8); if (reported_length < 8) { @@ -343,7 +343,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, void * if (body_length > reported_body_length) body_length = reported_body_length; - length = tvb_captured_length_remaining(message_tvb, 8+body_length); + length = tvb_length_remaining(message_tvb, 8+body_length); if (length < 0) { /* The footer wasn't captured at all. @@ -383,7 +383,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, void * footer_tvb = tvb_new_subset(message_tvb, 8+body_length, length, 8); dissect_cpfi_footer(footer_tvb, cpfi_tree); - return(tvb_captured_length(message_tvb)); + return(tvb_length(message_tvb)); } |