archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rechecked the merged libzip, took also the indents from the original to

Browse source 
avoid confusion next time
This commit is contained in:
Anatoliy Belsky 2012-06-05 22:11:07 +02:00
parent a39bcfc5ee
commit f4a44f18b8
6 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/zip/lib/zip_delete.c
View file

@ -40,7 +40,7 @@
ZIP_EXTERN(int) ZIP_EXTERN(int)
zip_delete(struct zip *za, zip_uint64_t idx) zip_delete(struct zip *za, zip_uint64_t idx)
{ {
if (idx < 0 || idx >= za->nentry) { if (idx >= za->nentry) {
_zip_error_set(&za->error, ZIP_ER_INVAL, 0); _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1; return -1;
} }

2
ext/zip/lib/zip_dirent.c
View file

@ -472,7 +472,7 @@ _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp,
static time_t static time_t
_zip_d2u_time(int dtime, int ddate) _zip_d2u_time(int dtime, int ddate)
{ {
struct tm tm = {0}; struct tm tm;
memset(&tm, 0, sizeof(tm)); memset(&tm, 0, sizeof(tm));

1
ext/zip/lib/zip_fopen_index.c
View file

@ -39,7 +39,6 @@
#include "zipint.h" #include "zipint.h"
ZIP_EXTERN(struct zip_file *) ZIP_EXTERN(struct zip_file *)

9
ext/zip/lib/zip_fread.c
View file

@ -61,14 +61,5 @@ zip_fread(struct zip_file *zf, void *outbuf, zip_uint64_t toread)
return -1; return -1;
} }
/* XXX the following left from the previous PHP port, let's see how to use it now */
/*zf->zstr->next_out = (Bytef *)outbuf;
zf->zstr->avail_out = toread;
out_before = zf->zstr->total_out;*/
/* endless loop until something has been accomplished */
/*for (;;) {
ret = inflate(zf->zstr, Z_SYNC_FLUSH);*/
return n; return n;
} }