diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:22:18 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:22:50 +0000 |
| commit | f92fab41a5266cb380c443882ce5efd5a7ee3318 (patch) | |
| tree | 13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-memcache.c | |
| parent | ad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff) | |
Remove a bunch more deprecated tvb_length calls
(getting really close!)
Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
Reviewed-on: https://code.wireshark.org/review/9081
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-memcache.c')
| -rw-r--r-- | epan/dissectors/packet-memcache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 7d30d14d53..f28964af8b 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -672,7 +672,7 @@ desegment_pdus (tvbuff_t *tvb, packet_info *pinfo, const int offset, /* data_offset has been set to start of the data block. */ if (!tvb_bytes_exist (tvb, data_offset, content_length)) { - length_remaining = tvb_length_remaining (tvb, data_offset); + length_remaining = tvb_captured_length_remaining (tvb, data_offset); reported_length_remaining = tvb_reported_length_remaining (tvb, data_offset); if (length_remaining < reported_length_remaining) { @@ -734,7 +734,7 @@ memcache_req_resp_hdrs_do_reassembly ( return FALSE; } - length_remaining = tvb_length_remaining (tvb, next_offset); + length_remaining = tvb_captured_length_remaining (tvb, next_offset); /* Request one more byte if we cannot find a * header (i.e. a line end). @@ -897,7 +897,7 @@ dissect_memcache_message (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t * value and the amount of data remaining in the frame. * */ - datalen = tvb_length_remaining (tvb, offset); + datalen = tvb_captured_length_remaining (tvb, offset); if (datalen > 0) { /* * We've processed "datalen" bytes worth of data @@ -927,7 +927,7 @@ content_data_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int */ if (tvb_reported_length_remaining (tvb, offset) != 0) { /* bytes actually remaining in this tvbuff. */ - datalen = tvb_length_remaining (tvb, offset); + datalen = tvb_captured_length_remaining (tvb, offset); if (content_length >= 0) { if (datalen >= (content_length + 2)) { /* also consider \r\n*/ datalen = content_length; |