diff options
| author | Evan Huus <eapache@gmail.com> | 2014-09-08 21:59:38 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-09-10 07:54:00 +0000 |
| commit | f9d4e0a815cf9c8f1fe5a5a106fcce3755daf8f2 (patch) | |
| tree | f3abbec56de906935bd40771c4be791e6fb695ea /epan/dissectors/packet-ziop.c | |
| parent | 1bf82c3b64b798eb3df99d24819fc8a961d7dbe0 (diff) | |
Replace deprecated tvb_length calls
And a few other misc. cleanups while in the neighbourhood.
Change-Id: Ic0d6836dec9c36d31ea244a6adc74d4713565090
Reviewed-on: https://code.wireshark.org/review/4047
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ziop.c')
| -rw-r--r-- | epan/dissectors/packet-ziop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index f7e93f266e..abac667c69 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -215,14 +215,14 @@ dissect_ziop_tcp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* if (tvb_get_ntohl(tvb, 0) == GIOP_MAGIC_NUMBER) { dissect_giop(tvb, pinfo, tree); - return tvb_length(tvb); + return tvb_captured_length(tvb); } return 0; } tcp_dissect_pdus(tvb, pinfo, tree, ziop_desegment, ZIOP_HEADER_SIZE, get_ziop_pdu_len, dissect_ziop, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } @@ -234,7 +234,7 @@ dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void conversation_t *conversation; /* check magic number and version */ - tot_len = tvb_length(tvb); + tot_len = tvb_captured_length(tvb); if (tot_len < ZIOP_HEADER_SIZE) /* tot_len < 12 */ { |