batch of manual tvb_length conversions

Change-Id: Ib3a1ddc4342a7a8648d6ed8bfcb35aa229c56a27
Reviewed-on: https://code.wireshark.org/review/2445
Reviewed-by: Michael Mann <mmann78@netscape.net>

16 files changed, 30 insertions, 30 deletions

diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index 83c80dc7fe..2f700fa2eb 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -255,7 +255,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
 	}
 
 	top_tree = NULL;
-	return tvb_length(tvb);
+	return tvb_captured_length(tvb);
 }
 
 /*--- proto_register_acse ----------------------------------------------*/
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index b99a908894..fd6f548636 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -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)
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index cf42d6e9b3..266db5e867 100644
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -1072,7 +1072,7 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
       dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree);
     }
 
-    return tvb_length(tvb);
+    return tvb_captured_length(tvb);
 }
 
 /**
@@ -1108,7 +1108,7 @@ dissect_c1222(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
   tcp_dissect_pdus(tvb, pinfo, tree, c1222_desegment, 5,
           get_c1222_message_len, dissect_c1222_common, data);
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 /*--- proto_register_c1222 -------------------------------------------*/
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index bdda6fe680..0a64de3386 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -1104,7 +1104,7 @@ dissect_camel_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi
     tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 static int
@@ -1142,7 +1142,7 @@ dissect_camel_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi
     tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 static int
@@ -1179,7 +1179,7 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
     tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 /*--- proto_reg_handoff_camel ---------------------------------------*/
diff --git a/asn1/charging_ase/packet-charging_ase-template.c b/asn1/charging_ase/packet-charging_ase-template.c
index 142e8d482f..20efe7ed94 100644
--- a/asn1/charging_ase/packet-charging_ase-template.c
+++ b/asn1/charging_ase/packet-charging_ase-template.c
@@ -55,10 +55,10 @@ dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_item *it;
     proto_tree *tr;
 
-    it=proto_tree_add_protocol_format(tree, proto_charging_ase, tvb, 0, tvb_length(tvb), "Charging ASE");
+    it=proto_tree_add_protocol_format(tree, proto_charging_ase, tvb, 0, tvb_captured_length(tvb), "Charging ASE");
     tr=proto_item_add_subtree(it, ett_charging_ase);
 
-    if(tvb_length(tvb)>0)
+    if(tvb_reported_length(tvb)>0)
     {
         dissect_charging_ase_ChargingMessageType_PDU(tvb , pinfo, tr, NULL);
     }
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 205d759c2a..12b2d057e2 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -140,7 +140,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
 			;
 	}
 
-	return tvb_length(tvb);
+	return tvb_captured_length(tvb);
 }
 
 /*--- proto_register_cmip ----------------------------------------------*/
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index bcb8f6386c..036b8c3bbe 100644
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -259,7 +259,7 @@ dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void
 	tcp_dissect_pdus(tvb, pinfo, parent_tree, cmp_desegment, offset, get_cmp_pdu_len,
 			dissect_cmp_tcp_pdu, data);
 
-	return tvb_length(tvb);
+	return tvb_captured_length(tvb);
 }
 
 
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index 085815ed7a..b0afc8e898 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -96,8 +96,8 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
 
     sha1_starts(&sha1_ctx);
 
-    sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_length(content)),
-		tvb_length(content));
+    sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_captured_length(content)),
+		tvb_captured_length(content));
 
     sha1_finish(&sha1_ctx, digest_buf);
 
@@ -107,8 +107,8 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
 
     md5_init(&md5_ctx);
 
-    md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_length(content)),
-	       tvb_length(content));
+    md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_captured_length(content)),
+	       tvb_captured_length(content));
 
     md5_finish(&md5_ctx, digest_buf);
 
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index d2c0f9f059..b7a7643542 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1785,7 +1785,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
 	}
 
 	top_tree = NULL;
-	return tvb_length(tvb);
+	return tvb_captured_length(tvb);
 }
 
 /*--- proto_register_acse ----------------------------------------------*/
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 819db7ee78..af6cc499cf 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -16267,7 +16267,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)
diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c
index 717d6bb5cd..dcbc9089e7 100644
--- a/epan/dissectors/packet-c1222.c
+++ b/epan/dissectors/packet-c1222.c
@@ -1592,7 +1592,7 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
       dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree);
     }
 
-    return tvb_length(tvb);
+    return tvb_captured_length(tvb);
 }
 
 /**
@@ -1628,7 +1628,7 @@ dissect_c1222(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
   tcp_dissect_pdus(tvb, pinfo, tree, c1222_desegment, 5,
           get_c1222_message_len, dissect_c1222_common, data);
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 /*--- proto_register_c1222 -------------------------------------------*/
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 0bd108faf2..5e82062d11 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7981,7 +7981,7 @@ dissect_camel_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi
     tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 static int
@@ -8019,7 +8019,7 @@ dissect_camel_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi
     tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 static int
@@ -8056,7 +8056,7 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
     tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 /*--- proto_reg_handoff_camel ---------------------------------------*/
diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index a8b6200dfb..e78ea1d187 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -847,10 +847,10 @@ dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_item *it;
     proto_tree *tr;
 
-    it=proto_tree_add_protocol_format(tree, proto_charging_ase, tvb, 0, tvb_length(tvb), "Charging ASE");
+    it=proto_tree_add_protocol_format(tree, proto_charging_ase, tvb, 0, tvb_captured_length(tvb), "Charging ASE");
     tr=proto_item_add_subtree(it, ett_charging_ase);
 
-    if(tvb_length(tvb)>0)
+    if(tvb_reported_length(tvb)>0)
     {
         dissect_charging_ase_ChargingMessageType_PDU(tvb , pinfo, tr, NULL);
     }
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 6699f459c2..dd075150e1 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -4417,7 +4417,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
 			;
 	}
 
-	return tvb_length(tvb);
+	return tvb_captured_length(tvb);
 }
 
 /*--- proto_register_cmip ----------------------------------------------*/
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index b7546a6a23..5ef6751b1f 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1641,7 +1641,7 @@ dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void
 	tcp_dissect_pdus(tvb, pinfo, parent_tree, cmp_desegment, offset, get_cmp_pdu_len,
 			dissect_cmp_tcp_pdu, data);
 
-	return tvb_length(tvb);
+	return tvb_captured_length(tvb);
 }
 
 
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 904499b75b..6d3de0d2c5 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -291,8 +291,8 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
 
     sha1_starts(&sha1_ctx);
 
-    sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_length(content)),
-		tvb_length(content));
+    sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_captured_length(content)),
+		tvb_captured_length(content));
 
     sha1_finish(&sha1_ctx, digest_buf);
 
@@ -302,8 +302,8 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
 
     md5_init(&md5_ctx);
 
-    md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_length(content)),
-	       tvb_length(content));
+    md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_captured_length(content)),
+	       tvb_captured_length(content));
 
     md5_finish(&md5_ctx, digest_buf);