From owner-svn-src-all@FreeBSD.ORG Thu Mar 5 06:26:08 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E01CD106566B; Thu, 5 Mar 2009 06:26:08 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C2F398FC18; Thu, 5 Mar 2009 06:26:08 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n256Q8b9065011; Thu, 5 Mar 2009 06:26:08 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n256Q8U2065008; Thu, 5 Mar 2009 06:26:08 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200903050626.n256Q8U2065008@svn.freebsd.org> From: Tim Kientzle Date: Thu, 5 Mar 2009 06:26:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189392 - head/lib/libarchive X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2009 06:26:09 -0000 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);