diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-01-28 09:41:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-28 13:03:23 -0800 |
| commit | 9170c03fd7f970d594cbf8510515f6eb855d25a9 (patch) | |
| tree | 42270354515cac75a6e77a8c4bdf5302095f2c92 /git-zlib.c | |
| parent | compat/zlib: provide stubs for `deflateSetHeader()` (diff) | |
| download | git-9170c03fd7f970d594cbf8510515f6eb855d25a9.tar.gz git-9170c03fd7f970d594cbf8510515f6eb855d25a9.zip | |
git-zlib: cast away potential constness of `next_in` pointer
The `struct git_zstream::next_in` variable points to the input data and
is used in combination with `struct z_stream::next_in`. While that
latter field is not marked as a constant in zlib, it is marked as such
in zlib-ng. This causes a couple of compiler errors when we try to
assign these fields to one another due to mismatching constness.
Fix the issue by casting away the potential constness of `next_in`.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-zlib.c')
| -rw-r--r-- | git-zlib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-zlib.c b/git-zlib.c index 2e973320c2..651dd9e07c 100644 --- a/git-zlib.c +++ b/git-zlib.c @@ -59,7 +59,8 @@ static void zlib_post_call(git_zstream *s) s->total_out = s->z.total_out; s->total_in = s->z.total_in; - s->next_in = s->z.next_in; + /* zlib-ng marks `next_in` as `const`, so we have to cast it away. */ + s->next_in = (unsigned char *) s->z.next_in; s->next_out = s->z.next_out; s->avail_in -= bytes_consumed; s->avail_out -= bytes_produced; |