diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 11:13:21 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 18:13:41 +0000 |
| commit | 9723c7a2f877f635f308c1534935ec4a90c661f8 (patch) | |
| tree | 449c3aff0c2f004569356ee987a9906805d2f9b7 /epan/dissectors/packet-giop.c | |
| parent | bc1472502f871d5d7d178f5588f9b5ed7a226180 (diff) | |
Remove more deprecated tvb_length calls
Change-Id: Ie40a195db622ebfb096fa5088c5467a1385e69bf
Reviewed-on: https://code.wireshark.org/review/9062
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-giop.c')
| -rw-r--r-- | epan/dissectors/packet-giop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 4bfb1422c0..92f12ed1dc 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -4772,7 +4772,7 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree payload_tvb = tvb_new_subset_remaining (tvb, GIOP_HEADER_SIZE); call_dissector(data_handle, payload_tvb, pinfo, tree); - return tvb_length(tvb); + return tvb_captured_length(tvb); } switch (header.GIOP_version.minor) @@ -4818,7 +4818,7 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree { gint rem_len; - rem_len = tvb_length_remaining(tvb, GIOP_HEADER_SIZE); + rem_len = tvb_captured_length_remaining(tvb, GIOP_HEADER_SIZE); if (rem_len <= 0) return 8; @@ -4936,7 +4936,7 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree } /* switch message_type */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } static guint @@ -4986,12 +4986,12 @@ dissect_giop_tcp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* if (!dissect_ziop_heur(tvb, pinfo, tree, NULL)) return 0; - return tvb_length(tvb); + return tvb_captured_length(tvb); } tcp_dissect_pdus(tvb, pinfo, tree, giop_desegment, GIOP_HEADER_SIZE, get_giop_pdu_len, dissect_giop_common, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } static gboolean @@ -5004,7 +5004,7 @@ dissect_giop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void /*define END_OF_GIOP_MESSAGE (offset - first_offset - GIOP_HEADER_SIZE) */ - tot_len = tvb_length(tvb); + tot_len = tvb_captured_length(tvb); if (tot_len < GIOP_HEADER_SIZE) /* tot_len < 12 */ { |