summaryrefslogtreecommitdiff
path: root/ext/zip/lib/zip_delete.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-11-04 13:23:36 +0100
committerRemi Collet <remi@php.net>2013-11-04 13:23:36 +0100
commit5dc37b351085a7b8cdc30ef2ebb349c8e5df4e2c (patch)
tree33357220b91d8553c0978e6392385e0fb8e49028 /ext/zip/lib/zip_delete.c
parent2f555b8e606b5f09d635cef4d3fcbcd6939adae2 (diff)
downloadphp-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_delete.c')
-rw-r--r--ext/zip/lib/zip_delete.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/lib/zip_delete.c b/ext/zip/lib/zip_delete.c
index 131d444124..cb769367cc 100644
--- a/ext/zip/lib/zip_delete.c
+++ b/ext/zip/lib/zip_delete.c
@@ -37,7 +37,7 @@
-ZIP_EXTERN(int)
+ZIP_EXTERN int
zip_delete(struct zip *za, zip_uint64_t idx)
{
if (idx >= za->nentry) {
@@ -55,7 +55,7 @@ zip_delete(struct zip *za, zip_uint64_t idx)
if (_zip_unchange(za, idx, 1) != 0)
return -1;
- za->entry[idx].state = ZIP_ST_DELETED;
+ za->entry[idx].deleted = 1;
return 0;
}