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_get_num_files.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_get_num_files.c')
| -rw-r--r-- | ext/zip/lib/zip_get_num_files.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/zip/lib/zip_get_num_files.c b/ext/zip/lib/zip_get_num_files.c index a442f293ec..29b06dc819 100644 --- a/ext/zip/lib/zip_get_num_files.c +++ b/ext/zip/lib/zip_get_num_files.c @@ -33,15 +33,17 @@ +#define _ZIP_COMPILING_DEPRECATED #include "zipint.h" -ZIP_EXTERN(int) +ZIP_EXTERN int zip_get_num_files(struct zip *za) { if (za == NULL) return -1; - return za->nentry; + /* XXX: check for overflow */ + return (int)za->nentry; } |