Update ASN.1 source files with the API changes done in g021e7af

Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf
index c09b900ae2..4d083835a8 100644
--- a/asn1/ansi_map/ansi_map.cnf
+++ b/asn1/ansi_map/ansi_map.cnf
@@ -280,7 +280,7 @@ TerminalType
 %(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_captured_length_remaining(SMS_BearerData_tvb,0);
 		if (length <=0){
 			proto_item_append_text(actx->created_item," length %%u",length);
 			SMS_BearerData_tvb = NULL;
@@ -325,7 +325,7 @@ TerminalType
 %(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_captured_length_remaining(parameter_tvb,0);
 		if (length <=0){
 			proto_item_append_text(actx->created_item, " length %%u",length);
 			return offset;
@@ -422,7 +422,7 @@ TerminalType
 	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_captured_length_remaining(parameter_tvb,0));
 	}
 #6.5.2.gn CDMA2000HandoffResponseIOSData
 #.FN_BODY CDMA2000HandoffResponseIOSData VAL_PTR = &parameter_tvb
@@ -433,7 +433,7 @@ TerminalType
 	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_captured_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 b99a908894..292a5721d9 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -643,7 +643,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_captured_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);
 }
@@ -688,7 +688,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_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_captured_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;
@@ -700,7 +700,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_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_captured_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
             break;
         case 3:
             /* Octet string */
@@ -726,14 +726,14 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_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_captured_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_captured_length_remaining(tvb,offset),ENC_ASCII|ENC_NA));
             break;
         case 3:
             /* Octet string */
@@ -1163,7 +1163,7 @@ dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_,
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset);
+    length = tvb_captured_length_remaining(tvb,offset);
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
@@ -1320,7 +1320,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_captured_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
@@ -1374,7 +1374,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_captured_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_cdmachanneldata);
@@ -3640,7 +3640,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_captured_length_remaining(tvb,offset);
     subtree = proto_item_add_subtree(actx->created_item, ett_win_trigger_list);
 
     while(offset< end_offset) {
@@ -4427,7 +4427,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
         break;
     }
 
-    return tvb_length(tvb);
+    return tvb_captured_length(tvb);
 }
 
 static void range_delete_callback(guint32 ssn)