Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull zlib 1.3 changes #1563

Merged
merged 8 commits into from
Aug 24, 2023
Merged

Pull zlib 1.3 changes #1563

merged 8 commits into from
Aug 24, 2023

Conversation

nmoinvaz
Copy link
Member

No description provided.

pmqs and others added 7 commits August 21, 2023 13:42
The comment said that the os is set to 255, when in fact it has
been set to the current os since zlib 1.2.3. Or at least our best
guess at the os made at compile time.
zlib does not use time_t, so _TIME_BITS is irrelevant. However it
may be defined anyway as part of a sledgehammer indiscriminately
applied to all builds.
@nmoinvaz
Copy link
Member Author

One thing I noticed was that zlib header comments at one point were changed to mention NULL instead of Z_NULL . But there were still instances of Z_NULL in the header. So maybe that needs to be cleaned up?

@nmoinvaz nmoinvaz added bug cleanup Improving maintainability or removing code. Compatibility API/ABI Compatibility issue labels Aug 21, 2023
@codecov
Copy link

codecov bot commented Aug 21, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.03% 🎉

Comparison is base (ca75732) 83.86% compared to head (ec91210) 83.90%.
Report is 2 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1563      +/-   ##
===========================================
+ Coverage    83.86%   83.90%   +0.03%     
===========================================
  Files          132      132              
  Lines        10843    10843              
  Branches      2801     2801              
===========================================
+ Hits          9094     9098       +4     
+ Misses        1050     1047       -3     
+ Partials       699      698       -1     
Flag Coverage Δ
macos_clang 42.97% <ø> (ø)
macos_gcc 73.61% <0.00%> (ø)
ubuntu_clang 82.50% <0.00%> (ø)
ubuntu_clang_debug 82.14% <0.00%> (ø)
ubuntu_clang_inflate_allow_invalid_dist 82.15% <0.00%> (ø)
ubuntu_clang_inflate_strict 82.49% <0.00%> (ø)
ubuntu_clang_mmap 82.59% <0.00%> (-0.23%) ⬇️
ubuntu_clang_pigz 13.96% <0.00%> (ø)
ubuntu_clang_pigz_no_optim 11.51% <0.00%> (ø)
ubuntu_clang_pigz_no_threads 13.78% <0.00%> (+0.05%) ⬆️
ubuntu_clang_reduced_mem 82.90% <0.00%> (ø)
ubuntu_clang_toolchain_riscv ∅ <ø> (∅)
ubuntu_gcc 75.30% <0.00%> (+0.07%) ⬆️
ubuntu_gcc_aarch64 77.40% <0.00%> (ø)
ubuntu_gcc_aarch64_compat_no_opt 75.65% <0.00%> (ø)
ubuntu_gcc_aarch64_no_acle 76.16% <0.00%> (ø)
ubuntu_gcc_aarch64_no_neon 76.16% <0.00%> (ø)
ubuntu_gcc_armhf 77.47% <0.00%> (ø)
ubuntu_gcc_armhf_compat_no_opt 75.60% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armhf_no_acle 77.42% <0.00%> (ø)
ubuntu_gcc_armhf_no_neon 77.32% <0.00%> (ø)
ubuntu_gcc_armsf 74.65% <ø> (ø)
ubuntu_gcc_armsf_compat_no_opt 74.11% <ø> (+0.01%) ⬆️
ubuntu_gcc_benchmark 73.57% <ø> (ø)
ubuntu_gcc_compat_no_opt 76.85% <0.00%> (+0.01%) ⬆️
ubuntu_gcc_compat_sprefix 73.57% <ø> (ø)
ubuntu_gcc_m32 73.23% <ø> (ø)
ubuntu_gcc_mingw_i686 73.50% <ø> (ø)
ubuntu_gcc_mingw_x86_64 73.51% <ø> (-0.16%) ⬇️
ubuntu_gcc_mips 74.97% <ø> (ø)
ubuntu_gcc_mips64 74.98% <ø> (ø)
ubuntu_gcc_no_avx2 74.28% <0.00%> (-0.06%) ⬇️
ubuntu_gcc_no_ctz 74.65% <ø> (ø)
ubuntu_gcc_no_ctzll 74.64% <ø> (ø)
ubuntu_gcc_no_pclmulqdq 74.22% <0.00%> (-0.07%) ⬇️
ubuntu_gcc_no_sse2 74.54% <0.00%> (ø)
ubuntu_gcc_no_sse42 74.73% <0.00%> (ø)
ubuntu_gcc_o1 74.18% <0.00%> (+0.05%) ⬆️
ubuntu_gcc_osb ∅ <ø> (∅)
ubuntu_gcc_pigz 38.10% <ø> (-0.08%) ⬇️
ubuntu_gcc_pigz_aarch64 39.11% <ø> (+0.05%) ⬆️
ubuntu_gcc_ppc 73.92% <ø> (ø)
ubuntu_gcc_ppc64 74.36% <ø> (ø)
ubuntu_gcc_ppc64_power9 74.53% <ø> (ø)
ubuntu_gcc_ppc64le 74.43% <ø> (ø)
ubuntu_gcc_ppc64le_novsx 74.75% <ø> (ø)
ubuntu_gcc_ppc64le_power9 74.31% <ø> (ø)
ubuntu_gcc_ppc_no_power8 74.63% <ø> (ø)
ubuntu_gcc_s390x 74.80% <ø> (ø)
ubuntu_gcc_s390x_dfltcc 71.92% <ø> (ø)
ubuntu_gcc_s390x_dfltcc_compat 73.98% <0.00%> (ø)
ubuntu_gcc_s390x_no_crc32 74.59% <ø> (ø)
ubuntu_gcc_sparc64 74.79% <ø> (ø)
ubuntu_gcc_sprefix 73.40% <ø> (+0.15%) ⬆️
win64_gcc 73.95% <ø> (ø)
win64_gcc_compat_no_opt 74.67% <ø> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
gzlib.c 70.60% <0.00%> (ø)

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Dead2
Copy link
Member

Dead2 commented Aug 22, 2023

Perhaps also update the zlib-compat version in this PR, to ensure consistency?

zlib.h.in Outdated Show resolved Hide resolved
Copy link
Member

@Dead2 Dead2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Dead2 Dead2 changed the title zlib 1.3 changes Pull zlib 1.3 changes Aug 23, 2023
@Dead2 Dead2 merged commit 7030ac7 into zlib-ng:develop Aug 24, 2023
134 of 135 checks passed
@Dead2
Copy link
Member

Dead2 commented Aug 24, 2023

Thanks for handling this @nmoinvaz 🥇

@Dead2 Dead2 mentioned this pull request Oct 13, 2023
FantasqueX added a commit to FantasqueX/zlib-ng that referenced this pull request Dec 18, 2023
zlib-ng#1563 this patch forgets to
update copyright string.
Dead2 pushed a commit that referenced this pull request Dec 20, 2023
#1563 this patch forgets to
update copyright string.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cleanup Improving maintainability or removing code. Compatibility API/ABI Compatibility issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants