diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-11-04 22:26:40 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-11-04 22:26:40 +0100 |
| commit | bf875e269a0df4f4274d0bda2c6504e0757330fc (patch) | |
| tree | 559d6d8b509416b54f705f6b79b865a635918174 /ext/zip/lib/zip_source_open.c | |
| parent | e5e25c43f476456f5b342d4cd289d0ce5f8bbac4 (diff) | |
| parent | 5b8ae0143f5b6cd735e0c201d85556654a89db9e (diff) | |
| download | php-git-bf875e269a0df4f4274d0bda2c6504e0757330fc.tar.gz | |
Merge branch 'master' of git.php.net:php-src
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
NEWS + UPGRADING
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
Fixed coredump due to abnormal implemention of phar
remove "PHP 6" staff
Diffstat (limited to 'ext/zip/lib/zip_source_open.c')
| -rw-r--r-- | ext/zip/lib/zip_source_open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/zip/lib/zip_source_open.c b/ext/zip/lib/zip_source_open.c index 2c768f7f3a..a5010393e7 100644 --- a/ext/zip/lib/zip_source_open.c +++ b/ext/zip/lib/zip_source_open.c @@ -1,6 +1,6 @@ /* zip_source_open.c -- open zip_source (prepare for reading) - Copyright (C) 2009 Dieter Baron and Thomas Klausner + Copyright (C) 2009-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> @@ -37,7 +37,7 @@ -ZIP_EXTERN(int) +int zip_source_open(struct zip_source *src) { zip_int64_t ret; @@ -60,7 +60,7 @@ zip_source_open(struct zip_source *src) ret = src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_OPEN); if (ret < 0) { - (void)zip_source_close(src->src); + zip_source_close(src->src); if (ret == ZIP_SOURCE_ERR_LOWER) src->error_source = ZIP_LES_LOWER; |