diff options
author | Remi Collet <remi@php.net> | 2013-11-04 13:23:36 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2013-11-04 13:23:36 +0100 |
commit | 5dc37b351085a7b8cdc30ef2ebb349c8e5df4e2c (patch) | |
tree | 33357220b91d8553c0978e6392385e0fb8e49028 /ext/zip/lib/zip_filerange_crc.c | |
parent | 2f555b8e606b5f09d635cef4d3fcbcd6939adae2 (diff) | |
download | php-git-5dc37b351085a7b8cdc30ef2ebb349c8e5df4e2c.tar.gz |
Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
Diffstat (limited to 'ext/zip/lib/zip_filerange_crc.c')
-rw-r--r-- | ext/zip/lib/zip_filerange_crc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/zip/lib/zip_filerange_crc.c b/ext/zip/lib/zip_filerange_crc.c index 4d1ad56692..3b1c868407 100644 --- a/ext/zip/lib/zip_filerange_crc.c +++ b/ext/zip/lib/zip_filerange_crc.c @@ -1,6 +1,6 @@ /* zip_filerange_crc.c -- compute CRC32 for a range of a file - Copyright (C) 2008 Dieter Baron and Thomas Klausner + Copyright (C) 2008-2013 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at <libzip@nih.at> @@ -56,13 +56,13 @@ _zip_filerange_crc(FILE *fp, off_t start, off_t len, uLong *crcp, } while (len > 0) { - n = len > BUFSIZE ? BUFSIZE : len; - if ((n=fread(buf, 1, n, fp)) <= 0) { + n = len > BUFSIZE ? BUFSIZE : (size_t)len; + if ((n=fread(buf, 1, n, fp)) == 0) { _zip_error_set(errp, ZIP_ER_READ, errno); return -1; } - *crcp = crc32(*crcp, buf, n); + *crcp = crc32(*crcp, buf, (uInt)n); len-= n; } |