I think I've now removed every off_t from the format handlers.

SVN-Revision: 2436

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 84bdbb22e562fec12efd772b4a7eb82f5310d178..00944aedec136eed1c64a763c1289f720f30da84 100644 (file)
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -348,7 +348,7 @@ struct iso9660 {
                uint32_t        size;
        } primary, joliet;
 
-       off_t   entry_sparse_offset;
+       int64_t entry_sparse_offset;
        int64_t entry_bytes_remaining;
        struct zisofs    entry_zisofs;
        struct content  *entry_content;

diff --git a/libarchive/archive_write_add_filter_compress.c b/libarchive/archive_write_add_filter_compress.c
index 0ae98ea5a1075fe8666a99b48e39c1e8fbf8115e..25a08a8d12dfbd19c5e092aae3c99f9814a2055d 100644 (file)
--- a/libarchive/archive_write_add_filter_compress.c
+++ b/libarchive/archive_write_add_filter_compress.c
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_compress.c
 #define        CLEAR   256             /* Table clear output code. */
 
 struct private_data {
-       off_t in_count, out_count, checkpoint;
+       int64_t in_count, out_count, checkpoint;
 
        int code_len;                   /* Number of bits/code. */
        int cur_maxcode;                /* Maximum code, given n_bits. */