diff options
| author | AndersBroman <a.broman@bredband.net> | 2015-04-16 13:31:57 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-16 11:36:43 +0000 |
| commit | 95f138e407f2afa9a3b26859116a91b99ff25fbc (patch) | |
| tree | 9bd87b48f0211891026e7d77b35152c56fd0593b /epan/dissectors/packet-cpfi.c | |
| parent | 2d79f56df1bb779cf5628359c778adbc98dfbf6a (diff) | |
| download | wireshark-95f138e407f2afa9a3b26859116a91b99ff25fbc.tar.gz wireshark-95f138e407f2afa9a3b26859116a91b99ff25fbc.tar.bz2 wireshark-95f138e407f2afa9a3b26859116a91b99ff25fbc.zip | |
Replace deprecated tvb_length APIs
Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d
Reviewed-on: https://code.wireshark.org/review/8086
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 81b46d78db..532be332e7 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -326,7 +326,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_length_remaining(message_tvb, 8); + length = tvb_captured_length_remaining(message_tvb, 8); reported_length = tvb_reported_length_remaining(message_tvb, 8); if (reported_length < 8) { @@ -341,7 +341,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_length_remaining(message_tvb, 8+body_length); + length = tvb_captured_length_remaining(message_tvb, 8+body_length); if (length < 0) { /* The footer wasn't captured at all. @@ -381,7 +381,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_length(message_tvb)); + return(tvb_reported_length(message_tvb)); } |