Skip to content
Snippets Groups Projects
Commit 9170c03f authored by Patrick Steinhardt's avatar Patrick Steinhardt :speech_balloon: Committed by Junio C Hamano
Browse files

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: default avatarPatrick Steinhardt <ps@pks.im>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent bb5d35c1
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment