git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 07/10] git-zlib: cast away potential constness of `next_in` pointer

From
Patrick Steinhardt <ps@pks.im>
Date
Jan 16, 2025, 09:17 UTC
Message-ID
<20250116-b4-pks-compat-drop-uncompress2-v3-7-f2af1f5c4a06@pks.im>
In-Reply-To
<20250116-b4-pks-compat-drop-uncompress2-v3-0-f2af1f5c4a06@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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-zlib.c b/git-zlib.c
index 2e973320c2..519b3647ac 100644
--- a/git-zlib.c
+++ b/git-zlib.c
@@ -59,7 +59,7 @@ 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;
+	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.0.257.gd3603152ad.dirty
Previous: Patrick SteinhardtNext: Justin Tobler
Message 49 of 56 in “compat/zlib: allow use of zlib-ng as backend”
  1. 0/8 compat/zlib: allow use of zlib-ng as backendPatrick Steinhardt, Jan 10, 2025
  2. 1/8 compat: drop `uncompress2()` compatibility shimPatrick Steinhardt, Jan 10, 2025
  3. 2/8 git-compat-util: drop `z_const` definePatrick Steinhardt, Jan 10, 2025
  4. 3/8 compat: introduce new "zlib.h" headerPatrick Steinhardt, Jan 10, 2025
  5. 4/8 git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"Patrick Steinhardt, Jan 10, 2025
  6. 5/8 compat/zlib: provide `deflateBound()` shim centrallyPatrick Steinhardt, Jan 10, 2025
  7. 7/8 git-zlib: cast away potential constness of `next_in` pointerPatrick Steinhardt, Jan 10, 2025
  8. 6/8 compat/zlib: provide stubs for `deflateSetHeader()`Patrick Steinhardt, Jan 10, 2025
  9. 8/8 compat/zlib: allow use of zlib-ng as backendPatrick Steinhardt, Jan 10, 2025
  10. Taylor BlauJan 10, 2025
  11. Patrick SteinhardtJan 13, 2025
  12. 00/10 compat/zlib: allow use of zlib-ng as backendPatrick Steinhardt, Jan 14, 2025
  13. 01/10 compat: drop `uncompress2()` compatibility shimPatrick Steinhardt, Jan 14, 2025
  14. 02/10 git-compat-util: drop `z_const` definePatrick Steinhardt, Jan 14, 2025
  15. 03/10 compat: introduce new "zlib.h" headerPatrick Steinhardt, Jan 14, 2025
  16. Karthik NayakJan 15, 2025
  17. Patrick SteinhardtJan 15, 2025
  18. Karthik NayakJan 16, 2025
  19. 04/10 git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"Patrick Steinhardt, Jan 14, 2025
  20. 05/10 compat/zlib: provide `deflateBound()` shim centrallyPatrick Steinhardt, Jan 14, 2025
  21. 06/10 compat/zlib: provide stubs for `deflateSetHeader()`Patrick Steinhardt, Jan 14, 2025
  22. Karthik NayakJan 15, 2025
  23. 07/10 git-zlib: cast away potential constness of `next_in` pointerPatrick Steinhardt, Jan 14, 2025
  24. Karthik NayakJan 15, 2025
  25. 08/10 compat/zlib: allow use of zlib-ng as backendPatrick Steinhardt, Jan 14, 2025
  26. 09/10 ci: switch linux-musl to use MesonPatrick Steinhardt, Jan 14, 2025
  27. Karthik NayakJan 15, 2025
  28. Patrick SteinhardtJan 15, 2025
  29. Karthik NayakJan 16, 2025
  30. 10/10 ci: make "linux-musl" job use zlib-ngPatrick Steinhardt, Jan 14, 2025
  31. Junio C HamanoJan 14, 2025
  32. Junio C HamanoJan 14, 2025
  33. Patrick SteinhardtJan 15, 2025
  34. Konstantin RyabitsevJan 15, 2025
  35. Junio C HamanoJan 15, 2025
  36. Patrick SteinhardtJan 15, 2025
  37. Konstantin RyabitsevJan 16, 2025
  38. Patrick SteinhardtJan 15, 2025
  39. Karthik NayakJan 16, 2025
  40. 00/10 compat/zlib: allow use of zlib-ng as backendPatrick Steinhardt, Jan 16, 2025
  41. 02/10 git-compat-util: drop `z_const` definePatrick Steinhardt, Jan 16, 2025
  42. 01/10 compat: drop `uncompress2()` compatibility shimPatrick Steinhardt, Jan 16, 2025
  43. 03/10 compat: introduce new "zlib.h" headerPatrick Steinhardt, Jan 16, 2025
  44. 04/10 git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"Patrick Steinhardt, Jan 16, 2025
  45. 05/10 compat/zlib: provide `deflateBound()` shim centrallyPatrick Steinhardt, Jan 16, 2025
  46. 06/10 compat/zlib: provide stubs for `deflateSetHeader()`Patrick Steinhardt, Jan 16, 2025
  47. Justin ToblerJan 27, 2025
  48. Patrick SteinhardtJan 28, 2025
  49. 07/10 git-zlib: cast away potential constness of `next_in` pointerPatrick Steinhardt, Jan 16, 2025
  50. Justin ToblerJan 27, 2025
  51. Patrick SteinhardtJan 28, 2025
  52. 08/10 compat/zlib: allow use of zlib-ng as backendPatrick Steinhardt, Jan 16, 2025
  53. 09/10 ci: switch linux-musl to use MesonPatrick Steinhardt, Jan 16, 2025
  54. 10/10 ci: make "linux-musl" job use zlib-ngPatrick Steinhardt, Jan 16, 2025
  55. Karthik NayakJan 17, 2025
  56. Patrick SteinhardtJan 17, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.