mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
ce76cec964
Throughout the Git codebase we're using the typedeffed version of `z_stream`, which maps to `struct z_stream_s`. By using a typedef instead of the struct it becomes somewhat harder to predeclare the symbol so that headers depending on the struct can do so without having to pull in "zlib-compat.h". We don't yet have users that would really care about this: the only users that declare `z_stream` as a pointer are in "reftable/block.h", which is a header that is internal to the reftable library. But in the next step we're going to expose the `struct reftable_block` publicly, and that struct does contain a pointer to `z_stream`. And as the public header shouldn't depend on "reftable/system.h", which is an internal implementation detail, we won't have the typedef for `z_stream` readily available. Prepare for this change by using `struct z_stream_s` throughout our code base. In case zlib-ng is used we use a define to map from `z_stream_s` to `zng_stream_s`. Drop the pre-declaration of `struct z_stream` while at it. This struct does not exist in the first place, and the declaration wasn't needed because "reftable/block.h" already includes "reftable/basics.h" which transitively includes "reftable/system.h" and thus "git-zlib.h". Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
1.6 KiB
C
54 lines
1.6 KiB
C
#ifndef COMPAT_ZLIB_H
|
|
#define COMPAT_ZLIB_H
|
|
|
|
#ifdef HAVE_ZLIB_NG
|
|
# include <zlib-ng.h>
|
|
|
|
# define z_stream_s zng_stream_s
|
|
# define gz_header_s zng_gz_header_s
|
|
|
|
# define crc32(crc, buf, len) zng_crc32(crc, buf, len)
|
|
|
|
# define inflate(strm, bits) zng_inflate(strm, bits)
|
|
# define inflateEnd(strm) zng_inflateEnd(strm)
|
|
# define inflateInit(strm) zng_inflateInit(strm)
|
|
# define inflateInit2(strm, bits) zng_inflateInit2(strm, bits)
|
|
# define inflateReset(strm) zng_inflateReset(strm)
|
|
|
|
# define deflate(strm, flush) zng_deflate(strm, flush)
|
|
# define deflateBound(strm, source_len) zng_deflateBound(strm, source_len)
|
|
# define deflateEnd(strm) zng_deflateEnd(strm)
|
|
# define deflateInit(strm, level) zng_deflateInit(strm, level)
|
|
# define deflateInit2(stream, level, method, window_bits, mem_level, strategy) zng_deflateInit2(stream, level, method, window_bits, mem_level, strategy)
|
|
# define deflateReset(strm) zng_deflateReset(strm)
|
|
# define deflateSetHeader(strm, head) zng_deflateSetHeader(strm, head)
|
|
|
|
#else
|
|
# include <zlib.h>
|
|
|
|
# if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
|
|
# define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
|
|
# endif
|
|
|
|
/*
|
|
* zlib only gained support for setting up the gzip header in v1.2.2.1. In
|
|
* Git we only set the header to make archives reproducible across different
|
|
* operating systems, so it's fine to simply make this a no-op when using a
|
|
* zlib version that doesn't support this yet.
|
|
*/
|
|
# if ZLIB_VERNUM < 0x1221
|
|
struct gz_header_s {
|
|
int os;
|
|
};
|
|
|
|
static int deflateSetHeader(z_streamp strm, struct gz_header_s *head)
|
|
{
|
|
(void)(strm);
|
|
(void)(head);
|
|
return Z_OK;
|
|
}
|
|
# endif
|
|
#endif /* HAVE_ZLIB_NG */
|
|
|
|
#endif /* COMPAT_ZLIB_H */
|