From: Patrick Steinhardt <ps@pks.im>
To: Justin Tobler <jltobler@gmail.com>
Cc: git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: Re: [PATCH v3 06/10] compat/zlib: provide stubs for `deflateSetHeader()`
Date: Tue, 28 Jan 2025 09:35:42 +0100 [thread overview]
Message-ID: <Z5iW3utsn6j3lbRh@pks.im> (raw)
In-Reply-To: <n64enlt3wcjftyz74evkdh53romwvmnwwd4qdpfaw6jedktcvh@fdy2zmdgmqm2>
On Sun, Jan 26, 2025 at 06:56:40PM -0600, Justin Tobler wrote:
> On 25/01/16 10:17AM, Patrick Steinhardt wrote:
> > diff --git a/compat/zlib-compat.h b/compat/zlib-compat.h
> > index 96a08811a9..2690bfce41 100644
> > --- a/compat/zlib-compat.h
> > +++ b/compat/zlib-compat.h
> > @@ -7,4 +7,17 @@
> > # define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
> > #endif
> >
> > +#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 /* COMPAT_ZLIB_H */
>
> In zlib versions under 1.2.2.1, `gz_header_s` and `deflateSetHeader()`
> are not defined. It looks like we are defining them here, but so they
> behave as a no-op where used. If I'm understanding this correctly, it
> might be nice to have a comment explaining the no-op component.
It's non-obvious why skipping the logic would be fine, so explicitly
documenting makes sense indeed.
Patrick
next prev parent reply other threads:[~2025-01-28 8:35 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-10 12:55 [PATCH 0/8] compat/zlib: allow use of zlib-ng as backend Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 1/8] compat: drop `uncompress2()` compatibility shim Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 2/8] git-compat-util: drop `z_const` define Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 3/8] compat: introduce new "zlib.h" header Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 4/8] git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 5/8] compat/zlib: provide `deflateBound()` shim centrally Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 6/8] compat/zlib: provide stubs for `deflateSetHeader()` Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 7/8] git-zlib: cast away potential constness of `next_in` pointer Patrick Steinhardt
2025-01-10 12:55 ` [PATCH 8/8] compat/zlib: allow use of zlib-ng as backend Patrick Steinhardt
2025-01-10 15:50 ` [PATCH 0/8] " Taylor Blau
2025-01-13 8:42 ` Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 00/10] " Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 01/10] compat: drop `uncompress2()` compatibility shim Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 02/10] git-compat-util: drop `z_const` define Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 03/10] compat: introduce new "zlib.h" header Patrick Steinhardt
2025-01-15 14:00 ` Karthik Nayak
2025-01-15 16:53 ` Patrick Steinhardt
2025-01-16 8:33 ` Karthik Nayak
2025-01-14 11:57 ` [PATCH v2 04/10] git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 05/10] compat/zlib: provide `deflateBound()` shim centrally Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 06/10] compat/zlib: provide stubs for `deflateSetHeader()` Patrick Steinhardt
2025-01-15 16:02 ` Karthik Nayak
2025-01-14 11:57 ` [PATCH v2 07/10] git-zlib: cast away potential constness of `next_in` pointer Patrick Steinhardt
2025-01-15 16:17 ` Karthik Nayak
2025-01-14 11:57 ` [PATCH v2 08/10] compat/zlib: allow use of zlib-ng as backend Patrick Steinhardt
2025-01-14 11:57 ` [PATCH v2 09/10] ci: switch linux-musl to use Meson Patrick Steinhardt
2025-01-15 16:25 ` Karthik Nayak
2025-01-15 16:53 ` Patrick Steinhardt
2025-01-16 8:33 ` Karthik Nayak
2025-01-14 11:57 ` [PATCH v2 10/10] ci: make "linux-musl" job use zlib-ng Patrick Steinhardt
2025-01-14 19:34 ` [PATCH v2 00/10] compat/zlib: allow use of zlib-ng as backend Junio C Hamano
2025-01-14 21:09 ` Junio C Hamano
2025-01-15 5:45 ` Patrick Steinhardt
2025-01-15 15:50 ` Konstantin Ryabitsev
2025-01-15 16:20 ` Junio C Hamano
2025-01-15 16:25 ` Patrick Steinhardt
2025-01-16 20:51 ` Konstantin Ryabitsev
2025-01-15 5:46 ` Patrick Steinhardt
2025-01-16 8:35 ` Karthik Nayak
2025-01-16 9:17 ` [PATCH v3 " Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 01/10] compat: drop `uncompress2()` compatibility shim Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 02/10] git-compat-util: drop `z_const` define Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 03/10] compat: introduce new "zlib.h" header Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 04/10] git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 05/10] compat/zlib: provide `deflateBound()` shim centrally Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 06/10] compat/zlib: provide stubs for `deflateSetHeader()` Patrick Steinhardt
2025-01-27 0:56 ` Justin Tobler
2025-01-28 8:35 ` Patrick Steinhardt [this message]
2025-01-16 9:17 ` [PATCH v3 07/10] git-zlib: cast away potential constness of `next_in` pointer Patrick Steinhardt
2025-01-27 0:58 ` Justin Tobler
2025-01-28 8:35 ` Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 08/10] compat/zlib: allow use of zlib-ng as backend Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 09/10] ci: switch linux-musl to use Meson Patrick Steinhardt
2025-01-16 9:17 ` [PATCH v3 10/10] ci: make "linux-musl" job use zlib-ng Patrick Steinhardt
2025-01-17 10:06 ` [PATCH v3 00/10] compat/zlib: allow use of zlib-ng as backend Karthik Nayak
2025-01-17 11:02 ` Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 " Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 01/10] compat: drop `uncompress2()` compatibility shim Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 02/10] git-compat-util: drop `z_const` define Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 03/10] compat: introduce new "zlib.h" header Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 04/10] git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 05/10] compat/zlib: provide `deflateBound()` shim centrally Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 06/10] compat/zlib: provide stubs for `deflateSetHeader()` Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 07/10] git-zlib: cast away potential constness of `next_in` pointer Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 08/10] compat/zlib: allow use of zlib-ng as backend Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 09/10] ci: switch linux-musl to use Meson Patrick Steinhardt
2025-01-28 8:41 ` [PATCH v4 10/10] ci: make "linux-musl" job use zlib-ng Patrick Steinhardt
2025-01-28 20:50 ` [PATCH v4 00/10] compat/zlib: allow use of zlib-ng as backend Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z5iW3utsn6j3lbRh@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=jltobler@gmail.com \
--cc=karthik.188@gmail.com \
--cc=me@ttaylorr.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).