summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-pres.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-06-19 17:18:16 +0000
committerMichael Mann <mmann78@netscape.net>2014-06-19 18:25:59 +0000
commit14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch)
treebdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-pres.c
parent3557ac4ec688b86ec7819005a3a181600e056251 (diff)
downloadwireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.gz
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-pres.c')
-rw-r--r--epan/dissectors/packet-pres.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index 4ba5f560e9..01f0e23843 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1470,7 +1470,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
/* dissect the packet */
dissect_UD_type_PDU(tvb, pinfo, clpres_tree);
- return tvb_captured_length(tvb);
+ return tvb_length(tvb);
}
/* we can't make any additional checking here */
@@ -1488,7 +1488,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
proto_tree_add_text(parent_tree, tvb, offset,
tvb_reported_length_remaining(tvb,offset),"User data");
}
- return tvb_captured_length(tvb);
+ return tvb_length(tvb);
}
while (tvb_reported_length_remaining(tvb, offset) > 0){
@@ -1500,7 +1500,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
}
}
- return tvb_captured_length(tvb);
+ return tvb_length(tvb);
}