diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
| commit | 8defcb855ab01d9c8ab4759cb793d80149b55a8c (patch) | |
| tree | ed51eb30a2cbc92b102557498fb3e4113da1bb07 /ext/zip/lib/zip_fopen_encrypted.c | |
| parent | 9c7dbb0487f5991fde03873ea8f5e66d6688415f (diff) | |
| parent | baddb1c73a170ef1d2c31bd54cddbc6e1ab596b9 (diff) | |
| download | php-git-8defcb855ab01d9c8ab4759cb793d80149b55a8c.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (6215 commits)
Extra comma
Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
Simplification
zend_get_property_info_quick() cleanup and optimization
initialize lineno before calling compile file file in phar
Use ADDREF instead of DUP, it must be enough.
Removed old irrelevant comment
fixed compilation error
Fix bug #68262: Broken reference across cloned objects
export functions needed for phpdbg
Fixed compilation
Optimized property access handlers. Removed EG(std_property_info).
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
Don't make difference between undefined and unaccessible properies when call __get() and family
Don't make useless CSE
array_pop/array_shift optimization
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
News entry for new curl constants
News entry for new curl constants
...
Diffstat (limited to 'ext/zip/lib/zip_fopen_encrypted.c')
| -rw-r--r-- | ext/zip/lib/zip_fopen_encrypted.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/zip/lib/zip_fopen_encrypted.c b/ext/zip/lib/zip_fopen_encrypted.c index 8aba062567..34230f00d7 100644 --- a/ext/zip/lib/zip_fopen_encrypted.c +++ b/ext/zip/lib/zip_fopen_encrypted.c @@ -37,14 +37,13 @@ -ZIP_EXTERN(struct zip_file *) -zip_fopen_encrypted(struct zip *za, const char *fname, int flags, - const char *password) +ZIP_EXTERN struct zip_file * +zip_fopen_encrypted(struct zip *za, const char *fname, zip_flags_t flags, const char *password) { - 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, password); + return zip_fopen_index_encrypted(za, (zip_uint64_t)idx, flags, password); } |