aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tpncp.c
diff options
context:
space:
mode:
authorAndersBroman <a.broman@bredband.net>2015-04-13 12:13:05 +0200
committerAnders Broman <a.broman58@gmail.com>2015-04-13 10:17:47 +0000
commitaaf347c029fd4c08881f79bb668f9f02530baf88 (patch)
treefd1a9a36ec58dcf6232964a8775f0b3feb0e65fe /epan/dissectors/packet-tpncp.c
parent502eef945b47e55b998d915fe853f436cec68abe (diff)
Remove deprecated API tvb_lengtRemove deprecated API tvb_length
Change-Id: Iea7dd7d13ce1a2ee375a2c4a75f897ba2c936921 Reviewed-on: https://code.wireshark.org/review/8048 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tpncp.c')
-rw-r--r--epan/dissectors/packet-tpncp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index f36116d474..b4572dc9d0 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -148,7 +148,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_tree *ltree,
case 1: case 2: case 3: case 4:
case 5: case 6: case 7: case 8:
if ((g_str_len = current_tpncp_data_field_info->tpncp_data_field_array_dim)) { /* add char array */
- g_str_len = MIN(g_str_len, tvb_length_remaining(tvb, *offset));
+ g_str_len = MIN(g_str_len, tvb_reported_length_remaining(tvb, *offset));
proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_data_field_descr,
tvb, *offset, g_str_len, ENC_NA|ENC_ASCII);
(*offset) += g_str_len;
@@ -213,7 +213,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_tree *ltree,
break;
}
current_tpncp_data_field_info = current_tpncp_data_field_info->p_next;
- if (tvb_length_remaining(tvb, *offset) <= 0) {
+ if (tvb_reported_length_remaining(tvb, *offset) <= 0) {
break;
}
}
@@ -309,7 +309,7 @@ static int dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
}
}
- return tvb_length(tvb);
+ return tvb_reported_length(tvb);
}
/*-------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -337,7 +337,7 @@ static int dissect_tpncp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
/* Otherwise use the regular dissector (might not give correct dissection). */
dissect_tpncp(tvb, pinfo, tree, data);
- return tvb_length(tvb);
+ return tvb_reported_length(tvb);
}
/*-------------------------------------------------------------------------------------------------------------------------------------------*/