Revert "Fixup: tvb_* -> tvb_captured"

[metze/wireshark/wip.git] / epan / dissectors / packet-rrc.c

diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 549ca960fd32cd1516bccb751afa2305f462e66b..177ed17089100071b8798f9f1a9f8cf627fe1012 100644 (file)
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -16614,7 +16614,7 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        1, 8, FALSE, &nas_sys_info_gsm_map_tvb);
 
-  length = tvb_captured_length(nas_sys_info_gsm_map_tvb);
+  length = tvb_length(nas_sys_info_gsm_map_tvb);
   if (length) {
     if (actx->private_data) {
       switch (GPOINTER_TO_UINT(actx->private_data)-1) {
@@ -56197,7 +56197,7 @@ dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
                                    ett_rrc_T_single_GSM_Message_r3, T_single_GSM_Message_r3_sequence);
 
 
-  bits_remaining = 8*tvb_captured_length(tvb) - offset;
+  bits_remaining = 8*tvb_length(tvb) - offset;
   whole_octets_remaining = bits_remaining / 8;
 
   gsm_message_tvb = tvb_new_octet_aligned(tvb, offset, 8*whole_octets_remaining);
@@ -56483,7 +56483,7 @@ dissect_rrc_T_single_GSM_Message_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
                                    ett_rrc_T_single_GSM_Message_r6, T_single_GSM_Message_r6_sequence);
 
 
-  bits_remaining = 8*tvb_captured_length(tvb) - offset;
+  bits_remaining = 8*tvb_length(tvb) - offset;
   whole_octets_remaining = bits_remaining / 8;
 
   gsm_message_tvb = tvb_new_octet_aligned(tvb, offset, 8*whole_octets_remaining);
@@ -95975,7 +95975,7 @@ dissect_rrc_GSM_Classmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
                                        1, 32, FALSE, &parameter_tvb);
 
   if (parameter_tvb){
-    de_ms_cm_3(parameter_tvb, tree, actx->pinfo, 0, tvb_captured_length(parameter_tvb), NULL, 0);
+    de_ms_cm_3(parameter_tvb, tree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
   }
 
 
@@ -122473,7 +122473,7 @@ dissect_rrc_GSM_MS_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1
                                        1, 64, FALSE, &parameter_tvb);
 
   if (parameter_tvb){
-    de_gmm_ms_radio_acc_cap(parameter_tvb, tree, actx->pinfo, 0, tvb_captured_length(parameter_tvb), NULL, 0);
+    de_gmm_ms_radio_acc_cap(parameter_tvb, tree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
   }