Attachment 238559 Details for Bug 268185 – devel/zziplib: fix build with clang 15

[patch] devel/zziplib: fix build with clang 15

devel__zziplib-fix-clang15-1.diff (text/plain), 3.52 KB, created by Dimitry Andric on 2022-12-05 22:57:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2022-12-05 22:57:14 UTC

Size: 3.52 KB

patch

obsolete

>commit 946b549e2f34724ea24d175b94358cc8d58437a2
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Mon Dec 5 23:55:48 2022 +0100
>
>    devel/zziplib: fix build with clang 15
>    
>    During an exp-run for llvm 15 (see bug 265425), it turned out that
>    devel/zziplib failed to build with clang (and lld) 15:
>    
>    /wrkdirs/usr/ports/devel/zziplib/work/zziplib-0.13.72/zzip/mmapped.c:664:11: error: incompatible pointer to integer conversion initializing 'off_t' (aka 'long') with an expression of type 'zzip_byte_t *' (aka 'unsigned char *') [-Wint-conversion]
>        off_t offset = zzip_file_header_to_data(header);
>              ^        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    /wrkdirs/usr/ports/devel/zziplib/work/zziplib-0.13.72/zzip/mmapped.c:666:34: warning: incompatible pointer types initializing 'struct zzip_extra_zip64 *' with an expression of type 'char *' [-Wincompatible-pointer-types]
>            struct zzip_extra_zip64* zip64 =
>                                     ^
>    /wrkdirs/usr/ports/devel/zziplib/work/zziplib-0.13.72/zzip/mmapped.c:673:34: warning: incompatible pointer types initializing 'struct zzip_extra_zip64 *' with an expression of type 'char *' [-Wincompatible-pointer-types]
>            struct zzip_extra_zip64* zip64 =
>                                     ^
>    /wrkdirs/usr/ports/devel/zziplib/work/zziplib-0.13.72/zzip/mmapped.c:685:24: error: incompatible integer to pointer conversion assigning to 'Bytef *' (aka 'unsigned char *') from 'off_t' (aka 'long') [-Wint-conversion]
>        file->zlib.next_in = offset;
>                           ^ ~~~~~~
>    2 warnings and 2 errors generated.
>    
>    Indeed, at several points it is needed to cast the returned pointers to
>    off_t, or vice versa.
>
>diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
>index ef7c52bfd59c..b897ad280576 100644
>--- a/devel/zziplib/Makefile
>+++ b/devel/zziplib/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	zziplib
> PORTVERSION=	0.13.72
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>diff --git a/devel/zziplib/files/patch-zzip_mmapped.c b/devel/zziplib/files/patch-zzip_mmapped.c
>new file mode 100644
>index 000000000000..affcda9947c5
>--- /dev/null
>+++ b/devel/zziplib/files/patch-zzip_mmapped.c
>@@ -0,0 +1,31 @@
>+--- zzip/mmapped.c.orig	2021-01-04 23:05:08 UTC
>++++ zzip/mmapped.c
>+@@ -661,16 +661,16 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
>+ 
>+     ___ /* a ZIP64 extended block may follow. */
>+     size_t csize = zzip_file_header_csize(header);
>+-    off_t offset = zzip_file_header_to_data(header);
>++    off_t offset = (off_t) zzip_file_header_to_data(header);
>+     if (csize == 0xFFFFu) {
>+-        struct zzip_extra_zip64* zip64 =
>++        struct zzip_extra_zip64* zip64 = (struct zzip_extra_zip64 *)
>+            zzip_file_header_to_extras(header);
>+         if (ZZIP_EXTRA_ZIP64_CHECK(zip64)) {
>+             csize = zzip_extra_zip64_csize(zip64);
>+         }
>+     }
>+     if (offset == 0xFFFFu) {
>+-        struct zzip_extra_zip64* zip64 =
>++        struct zzip_extra_zip64* zip64 = (struct zzip_extra_zip64 *)
>+            zzip_file_header_to_extras(header);
>+         if (ZZIP_EXTRA_ZIP64_CHECK(zip64)) {
>+             offset = zzip_extra_zip64_offset(zip64);
>+@@ -682,7 +682,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
>+     file->zlib.zalloc = Z_NULL;
>+     file->zlib.zfree = Z_NULL;
>+     file->zlib.avail_in = csize;
>+-    file->zlib.next_in = offset;
>++    file->zlib.next_in = (Bytef *) offset;
>+     ____;
>+ 
>+     DBG2("compressed size %i", (int) file->zlib.avail_in);

Actions: View | Diff

Attachments on bug 268185: 238559 | 238569 | 238689