Replace deprecated API tvb_length... with tvb_reported_length...

Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f
Reviewed-on: https://code.wireshark.org/review/8001
Reviewed-by: Anders Broman <a.broman58@gmail.com>

7 files changed, 38 insertions, 38 deletions

diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf
index 0648e99bc7..b895a82834 100644
--- a/asn1/ansi_map/ansi_map.cnf
+++ b/asn1/ansi_map/ansi_map.cnf
@@ -283,7 +283,7 @@ ReturnData
 %(DEFAULT_BODY)s
 	if (SMS_BearerData_tvb){
 		/* A zero length OCTET STRING will return a zero length tvb */
-		length = tvb_length_remaining(SMS_BearerData_tvb,0);
+		length = tvb_reported_length_remaining(SMS_BearerData_tvb,0);
 		if (length <=0){
 			proto_item_append_text(actx->created_item," length %%u",length);
 			SMS_BearerData_tvb = NULL;
@@ -328,7 +328,7 @@ ReturnData
 %(DEFAULT_BODY)s
 	if (parameter_tvb){
 		/* A zero length OCTET STRING will return a zero length tvb */
-		length = tvb_length_remaining(parameter_tvb,0);
+		length = tvb_reported_length_remaining(parameter_tvb,0);
 		if (length <=0){
 			proto_item_append_text(actx->created_item, " length %%u",length);
 			return offset;
@@ -425,7 +425,7 @@ ReturnData
 	if (parameter_tvb){
 		subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffInvokeIOSData);
 		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
-			0, tvb_length_remaining(parameter_tvb,0));
+			0, tvb_reported_length_remaining(parameter_tvb,0));
 	}
 #6.5.2.gn CDMA2000HandoffResponseIOSData
 #.FN_BODY CDMA2000HandoffResponseIOSData VAL_PTR = &parameter_tvb
@@ -436,7 +436,7 @@ ReturnData
 	if (parameter_tvb){
 		subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffResponseIOSData);
 		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
-			0, tvb_length_remaining(parameter_tvb,0));
+			0, tvb_reported_length_remaining(parameter_tvb,0));
 	}
 #6.5.2.wB ServiceIndicator N.S0011-0 v 1.0
 #.FN_BODY ServiceIndicator VAL_PTR = &parameter_tvb
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index aa7f92af62..03797d8cf0 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -650,7 +650,7 @@ dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mintype);
 
-    digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_length_remaining(tvb,offset), NULL, FALSE);
+    digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_reported_length_remaining(tvb,offset), NULL, FALSE);
     proto_tree_add_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, digit_str);
     proto_item_append_text(actx->created_item, " - %s", digit_str);
 }
@@ -695,7 +695,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
             if(octet_len == 0)
                 return;
             offset++;
-            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
+            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_reported_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
             proto_tree_add_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, digit_str);
             proto_item_append_text(actx->created_item, " - %s", digit_str);
             break;
@@ -707,7 +707,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
                 return;
             offset++;
             proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA);
-            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
+            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_reported_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
             break;
         case 3:
             /* Octet string */
@@ -733,14 +733,14 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
         switch ((octet&0xf)){
         case 1:
             /* BCD Coding */
-            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
+            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_reported_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
             proto_tree_add_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, digit_str);
             proto_item_append_text(actx->created_item, " - %s", digit_str);
             break;
         case 2:
             /* IA5 Coding */
             proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA);
-            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
+            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_reported_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
             break;
         case 3:
             /* Octet string */
@@ -1170,7 +1170,7 @@ dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_,
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_reported_length_remaining(tvb,offset);
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
@@ -1327,7 +1327,7 @@ dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_reported_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
@@ -1381,7 +1381,7 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_reported_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_cdmachanneldata);
@@ -3644,7 +3644,7 @@ dissect_ansi_map_win_trigger_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     proto_tree *subtree;
     guint8 octet;
 
-    end_offset = tvb_length_remaining(tvb,offset);
+    end_offset = tvb_reported_length_remaining(tvb,offset);
     subtree = proto_item_add_subtree(actx->created_item, ett_win_trigger_list);
 
     while(offset< end_offset) {
diff --git a/asn1/ansi_tcap/ansi_tcap.cnf b/asn1/ansi_tcap/ansi_tcap.cnf
index 4291b60104..4fdbbff7fa 100644
--- a/asn1/ansi_tcap/ansi_tcap.cnf
+++ b/asn1/ansi_tcap/ansi_tcap.cnf
@@ -86,7 +86,7 @@ OperationCode/private    VAL_PTR = &ansi_tcap_private.d.OperationCode_private
 #.FN_BODY Invoke/parameter
 
   if(find_tcap_subdissector(tvb, actx, tree))
-    offset = tvb_length(tvb);
+    offset = tvb_reported_length(tvb);
 
 
 #.FN_HDR Invoke
@@ -98,7 +98,7 @@ OperationCode/private    VAL_PTR = &ansi_tcap_private.d.OperationCode_private
 
 #.FN_BODY ReturnResult/parameter
   if(find_tcap_subdissector(tvb, actx, tree))
-    offset = tvb_length(tvb);
+    offset = tvb_reported_length(tvb);
 
 #.FN_HDR ReturnResult
   ansi_tcap_private.d.pdu = 2;
@@ -108,7 +108,7 @@ OperationCode/private    VAL_PTR = &ansi_tcap_private.d.OperationCode_private
 
 #.FN_BODY ReturnError/parameter
   if(find_tcap_subdissector(tvb, actx, tree))
-    offset = tvb_length(tvb);
+    offset = tvb_reported_length(tvb);
 
 #.FN_HDR ReturnError
   ansi_tcap_private.d.pdu = 3;
@@ -158,7 +158,7 @@ guint8 len;
 %(DEFAULT_BODY)s
 
 if(next_tvb) {
-	len = tvb_length_remaining(next_tvb, 0);
+	len = tvb_reported_length_remaining(next_tvb, 0);
 	if(len !=0){
 		/* 0 octets for the Unidirectional,
 		 * 4 octets for Query, Response & Abort
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index 30a491e531..ecb23dc6ec 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -134,7 +134,7 @@ offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_t
                                     &parameter_tvb);
 
 if (parameter_tvb){
-	len = tvb_length_remaining(parameter_tvb, 0);
+	len = tvb_reported_length_remaining(parameter_tvb, 0);
 	switch(len) {
 	case 1:
 		gp_tcapsrt_info->src_tid=tvb_get_guint8(parameter_tvb, 0);
@@ -173,7 +173,7 @@ offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_t
                                     &parameter_tvb);
 
 if (parameter_tvb){
-	len = tvb_length_remaining(parameter_tvb, 0);
+	len = tvb_reported_length_remaining(parameter_tvb, 0);
 	switch(len) {
 	case 1:
 		gp_tcapsrt_info->dst_tid=tvb_get_guint8(parameter_tvb, 0);
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index a50252dc34..f06e116f0d 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -1438,7 +1438,7 @@ dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mintype);
 
-    digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_length_remaining(tvb,offset), NULL, FALSE);
+    digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_reported_length_remaining(tvb,offset), NULL, FALSE);
     proto_tree_add_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, digit_str);
     proto_item_append_text(actx->created_item, " - %s", digit_str);
 }
@@ -1483,7 +1483,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
             if(octet_len == 0)
                 return;
             offset++;
-            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
+            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_reported_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
             proto_tree_add_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, digit_str);
             proto_item_append_text(actx->created_item, " - %s", digit_str);
             break;
@@ -1495,7 +1495,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
                 return;
             offset++;
             proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA);
-            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
+            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_reported_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
             break;
         case 3:
             /* Octet string */
@@ -1521,14 +1521,14 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
         switch ((octet&0xf)){
         case 1:
             /* BCD Coding */
-            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
+            digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, offset, tvb_reported_length_remaining(tvb,offset), &Dgt_tbcd, FALSE);
             proto_tree_add_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, digit_str);
             proto_item_append_text(actx->created_item, " - %s", digit_str);
             break;
         case 2:
             /* IA5 Coding */
             proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA);
-            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
+            proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_reported_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
             break;
         case 3:
             /* Octet string */
@@ -1958,7 +1958,7 @@ dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_,
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_reported_length_remaining(tvb,offset);
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
@@ -2115,7 +2115,7 @@ dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_reported_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
@@ -2169,7 +2169,7 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_reported_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_cdmachanneldata);
@@ -6023,7 +6023,7 @@ dissect_ansi_map_CDMA2000HandoffInvokeIOSData(gboolean implicit_tag _U_, tvbuff_
 	if (parameter_tvb){
 		subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffInvokeIOSData);
 		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
-			0, tvb_length_remaining(parameter_tvb,0));
+			0, tvb_reported_length_remaining(parameter_tvb,0));
 	}
 
 
@@ -6632,7 +6632,7 @@ dissect_ansi_map_CDMA2000HandoffResponseIOSData(gboolean implicit_tag _U_, tvbuf
 	if (parameter_tvb){
 		subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffResponseIOSData);
 		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
-			0, tvb_length_remaining(parameter_tvb,0));
+			0, tvb_reported_length_remaining(parameter_tvb,0));
 	}
 
 
@@ -10637,7 +10637,7 @@ dissect_ansi_map_SMS_BearerData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 	if (SMS_BearerData_tvb){
 		/* A zero length OCTET STRING will return a zero length tvb */
-		length = tvb_length_remaining(SMS_BearerData_tvb,0);
+		length = tvb_reported_length_remaining(SMS_BearerData_tvb,0);
 		if (length <=0){
 			proto_item_append_text(actx->created_item," length %u",length);
 			SMS_BearerData_tvb = NULL;
@@ -10683,7 +10683,7 @@ dissect_ansi_map_SMS_TeleserviceIdentifier(gboolean implicit_tag _U_, tvbuff_t *
 
 	if (parameter_tvb){
 		/* A zero length OCTET STRING will return a zero length tvb */
-		length = tvb_length_remaining(parameter_tvb,0);
+		length = tvb_reported_length_remaining(parameter_tvb,0);
 		if (length <=0){
 			proto_item_append_text(actx->created_item, " length %u",length);
 			return offset;
@@ -15293,7 +15293,7 @@ dissect_ansi_map_win_trigger_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     proto_tree *subtree;
     guint8 octet;
 
-    end_offset = tvb_length_remaining(tvb,offset);
+    end_offset = tvb_reported_length_remaining(tvb,offset);
     subtree = proto_item_add_subtree(actx->created_item, ett_win_trigger_list);
 
     while(offset< end_offset) {
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index 7b007b6ab4..9cba17f6d8 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -628,7 +628,7 @@ guint8 len;
 
 
 if(next_tvb) {
-	len = tvb_length_remaining(next_tvb, 0);
+	len = tvb_reported_length_remaining(next_tvb, 0);
 	if(len !=0){
 		/* 0 octets for the Unidirectional,
 		 * 4 octets for Query, Response & Abort
@@ -899,7 +899,7 @@ dissect_ansi_tcap_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 #line 87 "../../asn1/ansi_tcap/ansi_tcap.cnf"
 
   if(find_tcap_subdissector(tvb, actx, tree))
-    offset = tvb_length(tvb);
+    offset = tvb_reported_length(tvb);
 
 
 
@@ -944,7 +944,7 @@ static int
 dissect_ansi_tcap_T_parameter_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 100 "../../asn1/ansi_tcap/ansi_tcap.cnf"
   if(find_tcap_subdissector(tvb, actx, tree))
-    offset = tvb_length(tvb);
+    offset = tvb_reported_length(tvb);
 
 
 
@@ -988,7 +988,7 @@ static int
 dissect_ansi_tcap_T_parameter_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 110 "../../asn1/ansi_tcap/ansi_tcap.cnf"
   if(find_tcap_subdissector(tvb, actx, tree))
-    offset = tvb_length(tvb);
+    offset = tvb_reported_length(tvb);
 
 
 
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index e1673cdb11..4b43feeea3 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -767,7 +767,7 @@ offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_t
                                     &parameter_tvb);
 
 if (parameter_tvb){
-	len = tvb_length_remaining(parameter_tvb, 0);
+	len = tvb_reported_length_remaining(parameter_tvb, 0);
 	switch(len) {
 	case 1:
 		gp_tcapsrt_info->src_tid=tvb_get_guint8(parameter_tvb, 0);
@@ -842,7 +842,7 @@ offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_t
                                     &parameter_tvb);
 
 if (parameter_tvb){
-	len = tvb_length_remaining(parameter_tvb, 0);
+	len = tvb_reported_length_remaining(parameter_tvb, 0);
 	switch(len) {
 	case 1:
 		gp_tcapsrt_info->dst_tid=tvb_get_guint8(parameter_tvb, 0);