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-afp.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-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 926eb2674c..a4a0615f09 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -5224,7 +5224,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (!request_val) { /* missing request */ col_set_str(pinfo->cinfo, COL_INFO, "[Reply without query?]"); - return tvb_length(tvb); + return tvb_captured_length(tvb); } afp_command = request_val->command; @@ -5254,7 +5254,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "[Error!IP port reused, you need to split the capture file]"); expert_add_info(pinfo, ti, &ei_afp_ip_port_reused); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* @@ -5496,7 +5496,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (!len) { /* for some calls if the reply is an error there's no data */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } switch (afp_command) { @@ -5597,7 +5597,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pinfo, afp_tree); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static void afp_reinit( void) |