profinet: remove tvb_length deprecated API

Change-Id: Ie6f607d86235c0e2d4fc95f77a7500c1636da934
Reviewed-on: https://code.wireshark.org/review/7936
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c
index 13c14e9729..534f68b167 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/profinet/packet-pn-mrp.c
@@ -356,7 +356,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset,
     new_tvb = tvb_new_subset_remaining(tvb, offset);
     offset = 0;
 
-    for(i=0; tvb_length_remaining(tvb, offset) > 0; i++) {
+    for(i=0; tvb_reported_length_remaining(tvb, offset) > 0; i++) {
         /* MRP_TLVHeader.Type */
         offset = dissect_pn_uint8(new_tvb, offset, pinfo, tree, hf_pn_mrp_type, &type);
 
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index 7dcebf2077..d3e97c6608 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -112,7 +112,7 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset,
     /* MRRT_Version */
     offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrrt_version, &version);
 
-    while (tvb_length_remaining(tvb, offset) > 0) {
+    while (tvb_reported_length_remaining(tvb, offset) > 0) {
         /* MRRT_TLVHeader.Type */
         offset = dissect_pn_uint8(tvb, offset, pinfo, tree, hf_pn_mrrt_type, &type);
 
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index 60d5a1517f..b3e04f1b48 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -862,13 +862,13 @@ dissect_PNPTCP_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
         break;
     /* 0xFF44 - 0xFF5F reserved */
     default:
-        offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, tvb_length_remaining(tvb, offset));
+        offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, tvb_captured_length_remaining(tvb, offset));
 
         col_append_fstr(pinfo->cinfo, COL_INFO, "Reserved FrameID 0x%04x", u16FrameID);
 
         proto_item_append_text(item, "Reserved FrameID 0x%04x", u16FrameID);
 
-        offset += tvb_length_remaining(tvb, offset);
+        offset += tvb_captured_length_remaining(tvb, offset);
         break;
     }
 
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 8a8b73d073..3c43197a6a 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -191,7 +191,7 @@ IsDFP_Frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 u16Fram
     /* end of first CRC check */
 
     offset += 2;    /*Skip first crc */
-    tvb_len = tvb_length(tvb);
+    tvb_len = tvb_captured_length(tvb);
     if (offset + 4 > tvb_len)
         return FALSE;
     if (tvb_get_letohs(tvb, offset) == 0)
@@ -401,12 +401,12 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
             val_to_str( (u8FragStatus & 0x80) >> 7, pn_rt_frag_status_more_follows, "Unknown"));
 
         /* Is this a string or a bunch of bytes? Should it be FT_BYTES? */
-        proto_tree_add_string_format(sub_tree, hf_pn_rt_frag_data, tvb, offset, tvb_length(tvb) - offset, "data",
-            "Fragment Length: %d bytes", tvb_length(tvb) - offset);
-        col_append_fstr(pinfo->cinfo, COL_INFO, " Fragment Length: %d bytes", tvb_length(tvb) - offset);
+        proto_tree_add_string_format(sub_tree, hf_pn_rt_frag_data, tvb, offset, tvb_captured_length_remaining(tvb, offset), "data",
+            "Fragment Length: %d bytes", tvb_captured_length_remaining(tvb, offset));
+        col_append_fstr(pinfo->cinfo, COL_INFO, " Fragment Length: %d bytes", tvb_captured_length_remaining(tvb, offset));
 
-        dissect_pn_user_data_bytes(tvb, offset, pinfo, sub_tree, tvb_length(tvb) - offset, FRAG_DATA);
-        if ((guint)(tvb_length(tvb) - offset) < (guint)(u8FragDataLength *8)) {
+        dissect_pn_user_data_bytes(tvb, offset, pinfo, sub_tree, tvb_captured_length_remaining(tvb, offset), FRAG_DATA);
+        if ((guint)tvb_captured_length_remaining(tvb, offset) < (guint)(u8FragDataLength *8)) {
             proto_item_append_text(status_item, ": FragDataLength out of Framerange -> discarding!");
             return (TRUE);
         }
@@ -429,7 +429,7 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
             /* use frame data instead of "pnio fraglen" which sets 8 octet steps */
             pdu_frag = fragment_add_seq(&pdu_reassembly_table, tvb, offset,
                                         pinfo, u32ReasembleID, NULL, uFragNumber,
-                                        (tvb_length(tvb) - offset)/*u8FragDataLength*8*/, bMoreFollows, 0);
+                                        (tvb_captured_length_remaining(tvb, offset))/*u8FragDataLength*8*/, bMoreFollows, 0);
 
             if (pdu_frag && !bMoreFollows) /* PDU is complete! and last fragment */
             {   /* store this fragment as the completed fragment in hash table */
@@ -798,7 +798,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         /*col_set_str(pinfo->cinfo, COL_INFO, "Unknown");*/
 
         /* Oh, well, we don't know this; dissect it as data. */
-        dissect_pn_undecoded(next_tvb, 0, pinfo, tree, tvb_length(next_tvb));
+        dissect_pn_undecoded(next_tvb, 0, pinfo, tree, tvb_captured_length(next_tvb));
     }
 }