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-opensafety.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-opensafety.c') diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index d3162cdc8b..e60972d47f 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -741,7 +741,7 @@ dissect_data_payload ( proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, if (len > 0) { - payload_tvb = tvb_new_subset(tvb, off, len, tvb_reported_length_remaining(tvb, offset) ); + payload_tvb = tvb_new_subset_length_caplen(tvb, off, len, tvb_reported_length_remaining(tvb, offset) ); if ( ! dissector_try_heuristic(heur_opensafety_spdo_subdissector_list, payload_tvb, pinfo, epl_tree, &hdtbl_entry, &msgType)) call_dissector(data_dissector, payload_tvb, pinfo, epl_tree); @@ -2163,14 +2163,14 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha if ( global_display_intergap_data == TRUE && gapStart != frameOffset ) { /* Storing the gap data in subset, and calling the data dissector to display it */ - gap_tvb = tvb_new_subset(message_tvb, gapStart, (frameOffset - gapStart), reported_len); + gap_tvb = tvb_new_subset_length_caplen(message_tvb, gapStart, (frameOffset - gapStart), reported_len); call_dissector(data_dissector, gap_tvb, pinfo, tree); } /* Setting the gap to the next offset */ gapStart = frameOffset + frameLength; /* Adding second data source */ - next_tvb = tvb_new_subset ( message_tvb, frameOffset, frameLength, reported_len ); + next_tvb = tvb_new_subset_length_caplen ( message_tvb, frameOffset, frameLength, reported_len ); /* Adding a visual aid to the dissector tree */ add_new_data_source(pinfo, next_tvb, "openSAFETY Frame"); @@ -2256,7 +2256,7 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha if ( frameOffset < length && global_display_intergap_data == TRUE && gapStart != frameOffset ) { /* Storing the gap data in subset, and calling the data dissector to display it */ - gap_tvb = tvb_new_subset(message_tvb, gapStart, (length - gapStart), reported_len); + gap_tvb = tvb_new_subset_length_caplen(message_tvb, gapStart, (length - gapStart), reported_len); call_dissector(data_dissector, gap_tvb, pinfo, tree); } } -- cgit v1.2.3