svn commit: r189439 - head/lib/libarchive
Tim Kientzle
kientzle at FreeBSD.org
Thu Mar 5 22:13:27 PST 2009
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
More information about the svn-src-head
mailing list