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-sametime.c b/epan/dissectors/packet-sametime.c
index 0256c34d64..3cbe51291d 100644
--- a/epan/dissectors/packet-sametime.c
+++ b/epan/dissectors/packet-sametime.c
@@ -624,7 +624,7 @@ dissect_sametime_content(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
    }
 
    tap_queue_packet(sametime_tap, pinfo, sinfo);
-   return tvb_captured_length(tvb);
+   return tvb_length(tvb);
 }
 
 
@@ -673,7 +673,7 @@ get_sametime_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
    /*      because tcp_dissect_pdus was called with 4 as a required "fixed length".  */
    /*        But newer variants of this protocol with a full encrypted network stream  */
    /*        may require a more sophisticated dissection logic here                    */
-   guint32 N = tvb_captured_length_remaining(tvb, offset);
+   guint32 N = tvb_length_remaining(tvb, offset);
 
    return (N < 4) ? N : tvb_get_ntohl(tvb, offset) + 4;
 }
@@ -690,7 +690,7 @@ dissect_sametime(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
 
    tcp_dissect_pdus(tvb, pinfo, tree, global_sametime_reassemble_packets, 4,
          get_sametime_message_len, dissect_sametime_content, data);
-   return tvb_captured_length(tvb);
+   return tvb_length(tvb);
 }