svn commit: r189392 - head/lib/libarchive
Tim Kientzle
kientzle at FreeBSD.org
Wed Mar 4 22:26:09 PST 2009
Author: kientzle
Date: Thu Mar 5 06:26:08 2009
New Revision: 189392
URL: http://svn.freebsd.org/changeset/base/189392
Log:
Argh. r189389 was supposed to include r539 from libarchive.googlecode.com
but those compile fixes somehow got lost. This should fix the build.
Modified:
head/lib/libarchive/archive_read_support_compression_bzip2.c
head/lib/libarchive/archive_read_support_compression_compress.c
head/lib/libarchive/archive_read_support_format_cpio.c
Modified: head/lib/libarchive/archive_read_support_compression_bzip2.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_bzip2.c Thu Mar 5 03:18:22 2009 (r189391)
+++ head/lib/libarchive/archive_read_support_compression_bzip2.c Thu Mar 5 06:26:08 2009 (r189392)
@@ -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_fi
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;
Modified: head/lib/libarchive/archive_read_support_compression_compress.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_compress.c Thu Mar 5 03:18:22 2009 (r189391)
+++ head/lib/libarchive/archive_read_support_compression_compress.c Thu Mar 5 06:26:08 2009 (r189392)
@@ -168,7 +168,7 @@ compress_bidder_bid(struct archive_read_
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
Modified: head/lib/libarchive/archive_read_support_format_cpio.c
==============================================================================
--- head/lib/libarchive/archive_read_support_format_cpio.c Thu Mar 5 03:18:22 2009 (r189391)
+++ head/lib/libarchive/archive_read_support_format_cpio.c Thu Mar 5 06:26:08 2009 (r189392)
@@ -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);
More information about the svn-src-head
mailing list