[PATCH v4 07/10] git-zlib: cast away potential constness of `next_in` pointer
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jan 28, 2025, 08:41 UTC
- Message-ID
- <20250128-b4-pks-compat-drop-uncompress2-v4-7-129bc36ae8f5@pks.im>
- In-Reply-To
- <20250128-b4-pks-compat-drop-uncompress2-v4-0-129bc36ae8f5@pks.im>
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> --- git-zlib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
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;
-- 2.48.1.362.g079036d154.dirty