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-umts_fp.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-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 893c17201a..1044d8eed4 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -806,7 +806,7 @@ dissect_tb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (crci_bit == 0 || !p_fp_info->is_uplink) { - next_tvb = tvb_new_subset(tvb, offset + bit_offset/8, + next_tvb = tvb_new_subset_length_caplen(tvb, offset + bit_offset/8, ((bit_offset % 8) + p_fp_info->chan_tf_size[chan] + 7) / 8, -1); @@ -894,7 +894,7 @@ dissect_macd_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (preferences_call_mac_dissectors /*&& !rlc_is_ciphered(pinfo)*/) { tvbuff_t *next_tvb; - next_tvb = tvb_new_subset(tvb, offset + bit_offset/8, + next_tvb = tvb_new_subset_length_caplen(tvb, offset + bit_offset/8, ((bit_offset % 8) + length + 7)/8, -1); call_dissector_with_data(mac_fdd_hsdsch_handle, next_tvb, pinfo, top_level_tree, data); dissected = TRUE; @@ -959,7 +959,7 @@ dissect_macd_pdu_data_type_2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if (preferences_call_mac_dissectors /*&& !rlc_is_ciphered(pinfo)*/) { - tvbuff_t *next_tvb = tvb_new_subset(tvb, offset, length, -1); + tvbuff_t *next_tvb = tvb_new_subset_length_caplen(tvb, offset, length, -1); fpi->cur_tb = pdu; /*Set proper pdu index for MAC and higher layers*/ @@ -2845,7 +2845,7 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *next_tvb; pinfo->fd->subnum = macd_idx; /* set subframe number to current TB */ /* create new TVB and pass further on */ - next_tvb = tvb_new_subset(tvb, offset + bit_offset/8, + next_tvb = tvb_new_subset_length_caplen(tvb, offset + bit_offset/8, ((bit_offset % 8) + size + 7) / 8, -1); |