diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:30:22 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:31:25 +0000 |
| commit | 9b5b7c1a9074c7d64bd07fe68377d9ad06ccbc2a (patch) | |
| tree | fbb55ae5fdfb2799424c6ad919f0ef1c7429392d /epan/tvbuff_composite.c | |
| parent | 893e1e516ae58d662aeaec78f86838eb9d3246c5 (diff) | |
| download | wireshark-9b5b7c1a9074c7d64bd07fe68377d9ad06ccbc2a.tar.gz | |
Remove deprecated tvb_length calls
Trust that the files in epan/ immediately (not dissectors) know what they're
doing so just blindly convert them to captured length.
Change-Id: I872f7d58b2e15ae82c75fd56f4873996fbc97be7
Reviewed-on: https://code.wireshark.org/review/9083
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/tvbuff_composite.c')
| -rw-r--r-- | epan/tvbuff_composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c index 684e6440e9..6d9d98557b 100644 --- a/epan/tvbuff_composite.c +++ b/epan/tvbuff_composite.c @@ -164,7 +164,7 @@ composite_memcpy(tvbuff_t *tvb, void* _target, guint abs_offset, guint abs_lengt * then iterate across the other member tvb's, copying their portions * until we have copied all data. */ - member_length = tvb_length_remaining(member_tvb, member_offset); + member_length = tvb_captured_length_remaining(member_tvb, member_offset); /* composite_memcpy() can't handle a member_length of zero. */ DISSECTOR_ASSERT(member_length > 0); |