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/tvbtest.c | |
| parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) | |
| download | wireshark-7cd6906056922e4b8f68f1216d94eaa0809896fe.tar.gz | |
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/tvbtest.c')
| -rw-r--r-- | epan/tvbtest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/tvbtest.c b/epan/tvbtest.c index 48f6e024ec..36ccb653ff 100644 --- a/epan/tvbtest.c +++ b/epan/tvbtest.c @@ -358,32 +358,32 @@ run_tests(void) subset_length[0] = 8; subset_reported_length[0] = 9; - tvb_subset[0] = tvb_new_subset(tvb_small[0], 0, 8, 9); + tvb_subset[0] = tvb_new_subset_length_caplen(tvb_small[0], 0, 8, 9); subset[0] = &small[0][0]; subset_length[1] = 10; subset_reported_length[1] = 11; - tvb_subset[1] = tvb_new_subset(tvb_large[0], -10, 10, 11); + tvb_subset[1] = tvb_new_subset_length_caplen(tvb_large[0], -10, 10, 11); subset[1] = &large[0][9]; subset_length[2] = 16; subset_reported_length[2] = 17; - tvb_subset[2] = tvb_new_subset(tvb_small[1], -16, -1, 17); + tvb_subset[2] = tvb_new_subset_length_caplen(tvb_small[1], -16, -1, 17); subset[2] = &small[1][0]; subset_length[3] = 3; subset_reported_length[3] = 4; - tvb_subset[3] = tvb_new_subset(tvb_subset[0], 0, 3, 4); + tvb_subset[3] = tvb_new_subset_length_caplen(tvb_subset[0], 0, 3, 4); subset[3] = &small[0][0]; subset_length[4] = 5; subset_reported_length[4] = 6; - tvb_subset[4] = tvb_new_subset(tvb_subset[1], -5, 5, 6); + tvb_subset[4] = tvb_new_subset_length_caplen(tvb_subset[1], -5, 5, 6); subset[4] = &large[0][14]; subset_length[5] = 8; subset_reported_length[5] = 9; - tvb_subset[5] = tvb_new_subset(tvb_subset[2], 4, 8, 9); + tvb_subset[5] = tvb_new_subset_length_caplen(tvb_subset[2], 4, 8, 9); subset[5] = &small[1][4]; /* Test the TVBUFF_SUBSET objects. */ |