diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-11 05:51:19 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-11 05:51:19 +0000 |
| commit | 356a4613c71864a7d00fd6fbab17ad2f4724044a (patch) | |
| tree | 697db72424fefb55b1b7ff40d5e7cea7dcfc07af | |
| parent | ce81449ed9294f0104598762ce293c3521820987 (diff) | |
| download | wireshark-356a4613c71864a7d00fd6fbab17ad2f4724044a.tar.gz | |
Restore old composite_memcpy() prototype. Remove it from ops.
svn path=/trunk/; revision=50498
| -rw-r--r-- | epan/tvbuff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index bd1b644bfd..a29a92e6db 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -1040,7 +1040,7 @@ guint8_pbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles, g /************** ACCESSORS **************/ static void * -composite_memcpy(tvbuff_t *tvb, void* _target, guint abs_offset, guint abs_length) +composite_memcpy(tvbuff_t *tvb, void* _target, guint abs_offset, size_t abs_length) { struct tvb_composite *composite_tvb = (struct tvb_composite *) tvb; guint8 *target = (guint8 *) _target; @@ -1137,7 +1137,7 @@ tvb_memcpy(tvbuff_t *tvb, void *target, const gint offset, size_t length) if (tvb->ops == get_tvb_composite_ops()) { /* special case for composite, bug?! */ - return tvb->ops->tvb_memcpy(tvb, target, offset, length); + return composite_memcpy(tvb, target, offset, length); } if (tvb->ops->tvb_memcpy) @@ -3692,7 +3692,7 @@ static const struct tvb_ops tvb_composite_ops = { composite_free, /* free */ composite_offset, /* offset */ composite_get_ptr, /* get_ptr */ - composite_memcpy, /* memcpy */ + NULL, /* composite_memcpy */ /* memcpy */ NULL, /* find_guint8 XXX */ NULL, /* pbrk_guint8 XXX */ }; |