From 7cd6906056922e4b8f68f1216d94eaa0809896fe Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 9 Jan 2017 22:18:49 -0800 Subject: Rename tvb_new_subset() to tvb_new_subset_length_caplen(). This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris --- epan/dissectors/packet-tpkt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-tpkt.c') diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 937769c175..edc1952c86 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -327,7 +327,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (length > data_len) length = data_len; - next_tvb = tvb_new_subset(tvb, offset,length, data_len); + next_tvb = tvb_new_subset_length_caplen(tvb, offset,length, data_len); /* * Call the subdissector. @@ -531,7 +531,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, length = length_remaining - 4; if (length > data_len) length = data_len; - next_tvb = tvb_new_subset(tvb, offset, length, data_len); + next_tvb = tvb_new_subset_length_caplen(tvb, offset, length, data_len); /* * Call the subdissector. -- cgit v1.2.3