Revert "Fixup: tvb_* -> tvb_captured"

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

diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 3b4939b8aa28033188a1038463e8f3c265d9688f..968397cf58ad721d5145cc81d5607245157d46d4 100644 (file)
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -355,7 +355,7 @@ iuup_proto_tree_add_bits(proto_tree* tree, int hf, tvbuff_t* tvb, int offset, in
 static void dissect_iuup_payload(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint rfci_id _U_, int offset) {
     iuup_circuit_t* iuup_circuit;
     iuup_rfci_t *rfci;
-    int last_offset = tvb_captured_length(tvb) - 1;
+    int last_offset = tvb_length(tvb) - 1;
     guint bit_offset = 0;
     proto_item* pi;
 
@@ -579,7 +579,7 @@ static void add_hdr_crc(tvbuff_t* tvb, packet_info* pinfo, proto_item* iuup_tree
 static void add_payload_crc(tvbuff_t* tvb, packet_info* pinfo, proto_item* iuup_tree)
 {
     proto_item *crc_item;
-    int length = tvb_captured_length(tvb);
+    int length = tvb_length(tvb);
     guint16 crc10 = tvb_get_ntohs(tvb, 2) & 0x3FF;
     guint16 crccheck = update_crc10_by_bytes(crc10, tvb_get_ptr(tvb, 4, length - 4), length - 4);
 
@@ -612,7 +612,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "IuUP");
 
     if (two_byte_pseudoheader) {
-        int len = tvb_captured_length(tvb_in) - 2;
+        int len = tvb_length(tvb_in) - 2;
 
         phdr = tvb_get_ntohs(tvb,0);
 
@@ -780,7 +780,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
 
 
 static gboolean dissect_iuup_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-    int len = tvb_captured_length(tvb);
+    int len = tvb_length(tvb);
 
     guint8 first_octet =  tvb_get_guint8(tvb,0);
     guint8 second_octet =  tvb_get_guint8(tvb,1);
@@ -812,7 +812,7 @@ static gboolean dissect_iuup_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
 static void find_iuup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-    int len = tvb_captured_length(tvb);
+    int len = tvb_length(tvb);
     int offset = 0;
 
     while (len > 3) {