From 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 19 Jun 2014 17:18:16 +0000 Subject: 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 --- epan/dissectors/packet-q931.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-q931.c') diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 5780803f02..493dbde58e 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -2755,7 +2755,7 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, * to the actual size in the frame */ if (!pinfo->can_desegment) { - info_element_len = MIN(info_element_len, tvb_captured_length_remaining(tvb, offset + 3)); + info_element_len = MIN(info_element_len, tvb_length_remaining(tvb, offset + 3)); } /* * Do we have a handle for the H.225 @@ -3117,7 +3117,7 @@ dissect_q931_tpkt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * is one, and that the code put a TPKT header in one * segment and the rest of the PDU in another. */ - if (tvb_captured_length(tvb) == 4) { + if (tvb_length(tvb) == 4) { /* * It is - call the "dissect TPKT over a TCP stream" * routine. -- cgit v1.2.3