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>

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 3d8d20314e..df48c4e787 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -349,7 +349,7 @@ check_msrp_header(tvbuff_t *tvb)
      * is not longer than what's in the buffer, so the
      * "tvb_get_ptr()" calls below won't throw exceptions.   *
      */
-    if(tvb_captured_length(tvb) < 4 ||  tvb_get_ntohl(tvb, 0) != 0x4d535250 /* MSRP */){
+    if(tvb_length(tvb) < 4 ||  tvb_get_ntohl(tvb, 0) != 0x4d535250 /* MSRP */){
         return FALSE;
     }
 
@@ -398,7 +398,7 @@ find_end_line(tvbuff_t *tvb, gint start)
 {
     gint offset = start, next_offset, linelen;
 
-    while (tvb_captured_length_remaining(tvb, offset) > 0) {
+    while (tvb_length_remaining(tvb, offset) > 0) {
         /* 'desegment' is FALSE so will set next_offset to beyond the end of
            the buffer if no line ending is found */
         linelen =  tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
@@ -730,7 +730,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 
     }/* if tree */
     return message_end_offset;
-    /*  return tvb_captured_length(tvb); */
+    /*  return tvb_length(tvb); */
 
 /* If this protocol has a sub-dissector call it here, see section 1.8 */
 }