diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/tvbuff_real.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/tvbuff_real.c')
| -rw-r--r-- | epan/tvbuff_real.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/tvbuff_real.c b/epan/tvbuff_real.c index 62ec17cc..ba8bd82d 100644 --- a/epan/tvbuff_real.c +++ b/epan/tvbuff_real.c @@ -32,12 +32,12 @@ real_free(tvbuff_t *tvb) /* * XXX - do this with a union? */ - real_tvb->free_cb((gpointer)tvb->real_data); + real_tvb->free_cb((void *)tvb->real_data); } } -static guint -real_offset(const tvbuff_t *tvb _U_, const guint counter) +static unsigned +real_offset(const tvbuff_t *tvb _U_, const unsigned counter) { return counter; } @@ -49,13 +49,13 @@ static const struct tvb_ops tvb_real_ops = { real_offset, /* offset */ NULL, /* get_ptr */ NULL, /* memcpy */ - NULL, /* find_guint8 */ - NULL, /* pbrk_guint8 */ + NULL, /* find_uint8 */ + NULL, /* pbrk_uint8 */ NULL, /* clone */ }; tvbuff_t * -tvb_new_real_data(const guint8* data, const guint length, const gint reported_length) +tvb_new_real_data(const uint8_t* data, const unsigned length, const int reported_length) { tvbuff_t *tvb; struct tvb_real *real_tvb; @@ -68,7 +68,7 @@ tvb_new_real_data(const guint8* data, const guint length, const gint reported_le tvb->length = length; tvb->reported_length = reported_length; tvb->contained_length = reported_length; - tvb->initialized = TRUE; + tvb->initialized = true; /* * This is the top-level real tvbuff for this data source, @@ -103,7 +103,7 @@ tvb_set_child_real_data_tvbuff(tvbuff_t *parent, tvbuff_t *child) } tvbuff_t * -tvb_new_child_real_data(tvbuff_t *parent, const guint8* data, const guint length, const gint reported_length) +tvb_new_child_real_data(tvbuff_t *parent, const uint8_t* data, const unsigned length, const int reported_length) { tvbuff_t *tvb = tvb_new_real_data(data, length, reported_length); |