Fix remaining build failure in agressive warnings.

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index 316ad990e8dc2aab0e766cdffbc61911cbfac3f7..6281f93c6dd7a316ed2bbf248d59c514a904e37f 100644 (file)
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -1505,6 +1505,10 @@ free_decompression(struct archive_read *a, struct _7zip *zip)
 {
        int r = ARCHIVE_OK;
 
+#if !defined(HAVE_ZLIB_H) &&\
+       !(defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR))
+       (void)a;/* UNUSED */
+#endif
 #ifdef HAVE_LZMA_H
        if (zip->lzstream_valid)
                lzma_end(&(zip->lzstream));

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 37935ad58187bbfd7a14ebaa59dcecf3bc6b4847..715c418e86fd3304a2cfe2a8acc41ef3b2e13816 100644 (file)
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -2529,7 +2529,7 @@ set_mac_metadata(struct archive_write_disk *a, const char *pathname,
        }
        written = write(fd, metadata, metadata_size);
        close(fd);
-       if (written != metadata_size
+       if ((size_t)written != metadata_size
            || copyfile(tmp.s, pathname, 0,
                        COPYFILE_UNPACK | COPYFILE_NOFOLLOW
                        | COPYFILE_ACL | COPYFILE_XATTR)) {