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, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c
index 2bf7e063df..8c3dd201df 100644
--- a/epan/dissectors/packet-bthsp.c
+++ b/epan/dissectors/packet-bthsp.c
@@ -300,9 +300,9 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     gboolean         next;
     void            *data;
 
-    length = tvb_captured_length_remaining(tvb, offset);
+    length = tvb_length_remaining(tvb, offset);
     if (length <= 0)
-        return tvb_captured_length(tvb);
+        return tvb_length(tvb);
 
     if (!command_number) {
         proto_tree_add_item(tree, hf_data, tvb, offset, length, ENC_NA | ENC_ASCII);
@@ -601,7 +601,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         i_char += i_char_fix;
         proto_item_set_len(command_item, i_char);
     } else {
-        length = tvb_captured_length_remaining(tvb, offset);
+        length = tvb_length_remaining(tvb, offset);
         if (length < 0)
             length = 0;
         proto_item_set_len(command_item, length);
@@ -767,9 +767,9 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 
     if (role == ROLE_UNKNOWN) {
         col_append_fstr(pinfo->cinfo, COL_INFO, "Data: %s",
-                tvb_format_text(tvb, 0, tvb_captured_length(tvb)));
+                tvb_format_text(tvb, 0, tvb_length(tvb)));
         proto_tree_add_item(main_tree, hf_data, tvb, 0, -1, ENC_NA | ENC_ASCII);
-        return tvb_captured_length(tvb);
+        return tvb_length(tvb);
     }
 
     /* save fragments */
@@ -836,7 +836,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
         fragment->role              = role;
         fragment->index             = previous_fragment ? previous_fragment->index + previous_fragment->length : 0;
         fragment->reassemble_state  = REASSEMBLE_FRAGMENT;
-        fragment->length            = tvb_captured_length(tvb);
+        fragment->length            = tvb_length(tvb);
         fragment->data              = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length);
         fragment->previous_fragment = previous_fragment;
         tvb_memcpy(tvb, fragment->data, offset, fragment->length);
@@ -844,7 +844,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
         wmem_tree_insert32_array(fragments, key, fragment);
 
         /* Detect reassemble end character: \r for HS or \n for AG */
-        length = tvb_captured_length(tvb);
+        length = tvb_length(tvb);
         at_stream = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, length, ENC_ASCII);
 
         reassemble_start_offset = 0;
@@ -993,7 +993,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 
         if (fragment->index > 0 && fragment->length > 0) {
             proto_tree_add_item(main_tree, hf_fragment, tvb, offset,
-                                tvb_captured_length_remaining(tvb, offset), ENC_ASCII | ENC_NA);
+                                tvb_length_remaining(tvb, offset), ENC_ASCII | ENC_NA);
             reassembled_tvb = tvb_new_child_real_data(tvb, at_data,
                     fragment->index + fragment->length, fragment->index + fragment->length);
             add_new_data_source(pinfo, reassembled_tvb, "Reassembled HSP");
@@ -1003,24 +1003,24 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
         if (reassembled_tvb) {
             guint reassembled_offset = 0;
 
-            while (tvb_captured_length(reassembled_tvb) > reassembled_offset) {
+            while (tvb_length(reassembled_tvb) > reassembled_offset) {
                 reassembled_offset = dissect_at_command(reassembled_tvb,
                         pinfo, main_tree, reassembled_offset, role, command_number);
                 command_number += 1;
             }
         } else {
-            while (tvb_captured_length(tvb) > (guint) offset) {
+            while (tvb_length(tvb) > (guint) offset) {
                 offset = dissect_at_command(tvb, pinfo, main_tree, offset, role, command_number);
                 command_number += 1;
             }
         }
     } else {
         col_append_fstr(pinfo->cinfo, COL_INFO, "Fragment: %s",
-                tvb_format_text_wsp(tvb, offset, tvb_captured_length_remaining(tvb, offset)));
+                tvb_format_text_wsp(tvb, offset, tvb_length_remaining(tvb, offset)));
         pitem = proto_tree_add_item(main_tree, hf_fragmented, tvb, 0, 0, ENC_NA);
         PROTO_ITEM_SET_GENERATED(pitem);
         proto_tree_add_item(main_tree, hf_fragment, tvb, offset,
-                tvb_captured_length_remaining(tvb, offset), ENC_ASCII | ENC_NA);
+                tvb_length_remaining(tvb, offset), ENC_ASCII | ENC_NA);
     }
 
     return offset;