mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-23 11:18:54 +00:00
Merge r541,r542 from libarchive.googlecode.com: Two sign mismatches
in the Zip reader.
This commit is contained in:
parent
634fb9dd48
commit
f7c755c1db
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=189439
@ -172,7 +172,7 @@ archive_read_format_zip_bid(struct archive_read *a)
|
||||
{
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user