diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-01-09 22:18:49 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-01-10 06:19:37 +0000 |
commit | 7cd6906056922e4b8f68f1216d94eaa0809896fe (patch) | |
tree | 5a8c793f188ddda7f36a50369d00ff0de8f563e5 /epan/dissectors/packet-fip.c | |
parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) |
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 <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-fip.c')
-rw-r--r-- | epan/dissectors/packet-fip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index bfbaf867fc..3f5595f9f8 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -440,7 +440,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (!tvb_bytes_exist(tvb, desc_offset, dlen) || dlen > rlen) { break; } - desc_tvb = tvb_new_subset(tvb, desc_offset, dlen, -1); + desc_tvb = tvb_new_subset_length_caplen(tvb, desc_offset, dlen, -1); dtype = tvb_get_guint8(desc_tvb, 0); desc_offset += dlen; rlen -= dlen; @@ -493,7 +493,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) fc_data_t fc_data = {ETHERTYPE_FIP, 0}; subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_caps, &item); - ls_tvb = tvb_new_subset(desc_tvb, 4, dlen - 4, -1); + ls_tvb = tvb_new_subset_length_caplen(desc_tvb, 4, dlen - 4, -1); call_dissector_with_data(fc_handle, ls_tvb, pinfo, subtree, &fc_data); proto_item_append_text(item, "%u bytes", dlen - 4); } |