diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-pop.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
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 <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-pop.c')
| -rw-r--r-- | epan/dissectors/packet-pop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index a6fa21ca4b..c111b05ba0 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -203,7 +203,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Otherwise, just call it a continuation. */ if (is_continuation) { - length_remaining = tvb_captured_length_remaining(tvb, offset); + length_remaining = tvb_length_remaining(tvb, offset); col_add_fstr(pinfo->cinfo, COL_INFO, "S: DATA fragment, %d byte%s", length_remaining, plurality (length_remaining, "", "s")); } @@ -220,7 +220,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!frame_data_p) { - data_val->msg_read_len += tvb_captured_length(tvb); + data_val->msg_read_len += tvb_length(tvb); frame_data_p = wmem_new(wmem_file_scope(), struct pop_proto_data); @@ -234,7 +234,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo, frame_data_p->conversation_id, NULL, - tvb_captured_length(tvb), + tvb_length(tvb), frame_data_p->more_frags); next_tvb = process_reassembled_data(tvb, offset, pinfo, |