Skip to content

Commit 9170c03

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bb5d35c commit 9170c03

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-zlib.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ static void zlib_post_call(git_zstream *s)
5959

6060
s->total_out = s->z.total_out;
6161
s->total_in = s->z.total_in;
62-
s->next_in = s->z.next_in;
62+
/* zlib-ng marks `next_in` as `const`, so we have to cast it away. */
63+
s->next_in = (unsigned char *) s->z.next_in;
6364
s->next_out = s->z.next_out;
6465
s->avail_in -= bytes_consumed;
6566
s->avail_out -= bytes_produced;

0 commit comments

Comments
 (0)