From owner-svn-src-all@FreeBSD.ORG  Fri Mar  6 06:13:27 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 3CDD8106564A;
	Fri,  6 Mar 2009 06:13:27 +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 2B48C8FC19;
	Fri,  6 Mar 2009 06:13:27 +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 n266DP5c010301;
	Fri, 6 Mar 2009 06:13:25 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n266DPwH010300;
	Fri, 6 Mar 2009 06:13:25 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903060613.n266DPwH010300@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Fri, 6 Mar 2009 06:13:25 +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: r189439 - 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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Mar 2009 06:13:27 -0000

Author: kientzle
Date: Fri Mar  6 06:13:25 2009
New Revision: 189439
URL: http://svn.freebsd.org/changeset/base/189439

Log:
  Merge r541,r542 from libarchive.googlecode.com:  Two sign mismatches
  in the Zip reader.

Modified:
  head/lib/libarchive/archive_read_support_format_zip.c

Modified: head/lib/libarchive/archive_read_support_format_zip.c
==============================================================================
--- head/lib/libarchive/archive_read_support_format_zip.c	Fri Mar  6 05:58:56 2009	(r189438)
+++ head/lib/libarchive/archive_read_support_format_zip.c	Fri Mar  6 06:13:25 2009	(r189439)
@@ -172,7 +172,7 @@ archive_read_format_zip_bid(struct archi
 {
 	const char *p;
 	const void *buff;
-	size_t bytes_avail, offset;
+	ssize_t bytes_avail, offset;
 
 	if ((p = __archive_read_ahead(a, 4, NULL)) == NULL)
 		return (-1);
@@ -241,7 +241,8 @@ skip_sfx(struct archive_read *a)
 {
 	const void *h;
 	const char *p, *q;
-	size_t skip, bytes;
+	size_t skip;
+	ssize_t bytes;
 
 	/*
 	 * TODO: We should be able to skip forward by a bunch