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-ndmp.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-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index f8d0f8f5ed..9fab54f7ec 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1364,7 +1364,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb_rlen=tvb_reported_length_remaining(tvb, offset); if(tvb_rlen>16) tvb_rlen=16; - cdb_tvb=tvb_new_subset(tvb, offset, tvb_len, tvb_rlen); + cdb_tvb=tvb_new_subset_length_caplen(tvb, offset, tvb_len, tvb_rlen); if(ndmp_conv_data->task && !ndmp_conv_data->task->itlq){ ndmp_conv_data->task->itlq=wmem_new(wmem_file_scope(), itlq_nexus_t); @@ -1417,7 +1417,7 @@ dissect_execute_cdb_payload(tvbuff_t *tvb, int offset, packet_info *pinfo, proto tvb_rlen=tvb_reported_length_remaining(tvb, offset); if(tvb_rlen>(int)payload_len) tvb_rlen=payload_len; - data_tvb=tvb_new_subset(tvb, offset, tvb_len, tvb_rlen); + data_tvb=tvb_new_subset_length_caplen(tvb, offset, tvb_len, tvb_rlen); if(ndmp_conv_data->task && ndmp_conv_data->task->itlq){ /* ndmp conceptually always send both read and write |