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_fopen.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_fopen.c')
-rw-r--r-- | ext/zip/lib/zip_fopen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/zip/lib/zip_fopen.c b/ext/zip/lib/zip_fopen.c index f62adbbf92..331f79ea36 100644 --- a/ext/zip/lib/zip_fopen.c +++ b/ext/zip/lib/zip_fopen.c @@ -37,13 +37,13 @@ -ZIP_EXTERN(struct zip_file *) -zip_fopen(struct zip *za, const char *fname, int flags) +ZIP_EXTERN struct zip_file * +zip_fopen(struct zip *za, const char *fname, zip_flags_t flags) { - int idx; + zip_int64_t idx; if ((idx=zip_name_locate(za, fname, flags)) < 0) return NULL; - return zip_fopen_index_encrypted(za, idx, flags, za->default_password); + return zip_fopen_index_encrypted(za, (zip_uint64_t)idx, flags, za->default_password); } |