diff options
author | kientzle <kientzle@FreeBSD.org> | 2009-03-05 06:26:08 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2009-03-05 06:26:08 +0000 |
commit | dbd5e7d42aeaa80487542bc4a35a95048ff56658 (patch) | |
tree | fa7f06058741f0c2dbdba9484f4683c9228f1811 | |
parent | 512a7ff8a0eee1ed7c654a5cefbd90e9e5c75223 (diff) | |
download | FreeBSD-src-dbd5e7d42aeaa80487542bc4a35a95048ff56658.zip FreeBSD-src-dbd5e7d42aeaa80487542bc4a35a95048ff56658.tar.gz |
Argh. r189389 was supposed to include r539 from libarchive.googlecode.com
but those compile fixes somehow got lost. This should fix the build.
-rw-r--r-- | lib/libarchive/archive_read_support_compression_bzip2.c | 4 | ||||
-rw-r--r-- | lib/libarchive/archive_read_support_compression_compress.c | 5 | ||||
-rw-r--r-- | lib/libarchive/archive_read_support_format_cpio.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c index ea39cfe..9a1d70e 100644 --- a/lib/libarchive/archive_read_support_compression_bzip2.c +++ b/lib/libarchive/archive_read_support_compression_bzip2.c @@ -105,7 +105,7 @@ static int bzip2_reader_bid(struct archive_read_filter_bidder *self, struct archive_read_filter *filter) { const unsigned char *buffer; - size_t avail; + ssize_t avail; int bits_checked; (void)self; /* UNUSED */ @@ -200,7 +200,7 @@ bzip2_filter_read(struct archive_read_filter *self, const void **p) struct private_data *state; size_t read_avail, decompressed; unsigned char *read_buf; - int ret; + ssize_t ret; state = (struct private_data *)self->data; read_avail = 0; diff --git a/lib/libarchive/archive_read_support_compression_compress.c b/lib/libarchive/archive_read_support_compression_compress.c index 2a4383a..fb65abd5 100644 --- a/lib/libarchive/archive_read_support_compression_compress.c +++ b/lib/libarchive/archive_read_support_compression_compress.c @@ -168,7 +168,7 @@ compress_bidder_bid(struct archive_read_filter_bidder *self, struct archive_read_filter *filter) { const unsigned char *buffer; - size_t avail; + ssize_t avail; int bits_checked; (void)self; /* UNUSED */ @@ -410,7 +410,8 @@ static int getbits(struct archive_read_filter *self, int n) { struct private_data *state = (struct private_data *)self->data; - int code, ret; + int code; + ssize_t ret; static const int mask[] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff, 0xffff diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c index 218371a..fd1c01f 100644 --- a/lib/libarchive/archive_read_support_format_cpio.c +++ b/lib/libarchive/archive_read_support_format_cpio.c @@ -329,7 +329,8 @@ find_newc_header(struct archive_read *a) { const void *h; const char *p, *q; - size_t skip, bytes, skipped = 0; + size_t skip, skipped = 0; + ssize_t bytes; for (;;) { h = __archive_read_ahead(a, sizeof(struct cpio_newc_header), &bytes); @@ -463,7 +464,8 @@ find_odc_header(struct archive_read *a) { const void *h; const char *p, *q; - size_t skip, bytes, skipped = 0; + size_t skip, skipped = 0; + ssize_t bytes; for (;;) { h = __archive_read_ahead(a, sizeof(struct cpio_odc_header), &bytes); |