diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:45 -0800 |
| commit | 9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0 (patch) | |
| tree | 54481fadf7f95c85d003db2a4b591ce51cb266d5 /git-zlib.c | |
| parent | 9fad473faed7862855ced123de81a53fa27187d9 (diff) | |
| parent | 78cdeed4c79d165c915e8de0355cc3fb7f5797c5 (diff) | |
| download | git-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.tar.xz | |
Merge branch 'ps/zlib-ng'
The code paths to interact with zlib has been cleaned up in
preparation for building with zlib-ng.
* ps/zlib-ng:
ci: make "linux-musl" job use zlib-ng
ci: switch linux-musl to use Meson
compat/zlib: allow use of zlib-ng as backend
git-zlib: cast away potential constness of `next_in` pointer
compat/zlib: provide stubs for `deflateSetHeader()`
compat/zlib: provide `deflateBound()` shim centrally
git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
compat: introduce new "zlib.h" header
git-compat-util: drop `z_const` define
compat: drop `uncompress2()` compatibility shim
Diffstat (limited to 'git-zlib.c')
| -rw-r--r-- | git-zlib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-zlib.c b/git-zlib.c index d43bbeb6da..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; @@ -147,10 +148,6 @@ int git_inflate(git_zstream *strm, int flush) return status; } -#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200 -#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11) -#endif - unsigned long git_deflate_bound(git_zstream *strm, unsigned long size) { return deflateBound(&strm->z, size); |