From ebc8ec83fdaefd6253aeb8db587f2d3b413fc340 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Sun, 21 Jun 2015 06:48:58 -0400 Subject: Remove deprecated tvb_length from a bunch of dissectors Change-Id: I5c777806cb1403062a9d85261149d722df57b239 Reviewed-on: https://code.wireshark.org/review/9005 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-waveagent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-waveagent.c') diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c index 0de2107537..dbdbc107ef 100644 --- a/epan/dissectors/packet-waveagent.c +++ b/epan/dissectors/packet-waveagent.c @@ -1003,7 +1003,7 @@ static int dissect_waveagent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint32 wa_payload_offset; /* Check that there's enough data */ - if (tvb_length(tvb) < 52 ) + if (tvb_reported_length(tvb) < 52 ) return 0; magic_number = tvb_get_ntohl(tvb, 16) & 0x0FFFFFFF; /* Mask magic number off */ @@ -1071,8 +1071,8 @@ static int dissect_waveagent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree dissect_wa_payload(wa_payload_offset, payload_tree, tvb, control_word, version); } -/* Return the amount of data this dissector was able to dissect */ - return tvb_length(tvb); + /* Return the amount of data this dissector was able to dissect */ + return tvb_captured_length(tvb); } static gboolean dissect_waveagent_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) -- cgit v1.2.3