From 739f7ace12455b589f464f3d72eb809be950f0a1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2013 14:03:25 +0200 Subject: [PATCH 1/6] drop PCRE test (not used, php_zip_pcre is unconditionaly defined) --- config.m4 | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/config.m4 b/config.m4 index edf0d2a..aade73d 100755 --- a/config.m4 +++ b/config.m4 @@ -47,30 +47,6 @@ if test "$PHP_ZIP" != "no"; then PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR) fi - dnl This is PECL build, check if bundled PCRE library is used - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=$INCLUDES - AC_EGREP_CPP(yes,[ -#include
-#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -yes -#endif - ],[ - PHP_PCRE_REGEX=yes - ],[ - AC_EGREP_CPP(yes,[ -#include
-#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -yes -#endif - ],[ - PHP_PCRE_REGEX=pecl - ],[ - PHP_PCRE_REGEX=no - ]) - ]) - CPPFLAGS=$old_CPPFLAGS - PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_add_dir.c lib/zip_add_entry.c\ lib/zip_close.c lib/zip_delete.c lib/zip_dir_add.c lib/zip_dirent.c lib/zip_discard.c lib/zip_entry.c\ lib/zip_err_str.c lib/zip_error.c lib/zip_error_clear.c lib/zip_error_get.c lib/zip_error_get_sys_type.c\ -- 1.8.1.6 From 09986e947ff8452affb1ae709d0e93dbd112f078 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2013 14:04:23 +0200 Subject: [PATCH 2/6] drop duplicate include (already in php_zip.h) --- zip_stream.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/zip_stream.c b/zip_stream.c index 400edd6..dde5c0b 100755 --- a/zip_stream.c +++ b/zip_stream.c @@ -6,8 +6,6 @@ #if HAVE_ZIP #ifdef ZEND_ENGINE_2 -#include "lib/zip.h" - #include "php_streams.h" #include "ext/standard/file.h" #include "ext/standard/php_string.h" -- 1.8.1.6 From b06d3de0b7b8e2ea09d55c24b7661f894b70eba2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2013 14:05:00 +0200 Subject: [PATCH 3/6] drop duplicate include (already in php_zip.h) --- php_zip.c | 1 - 1 file changed, 1 deletion(-) diff --git a/php_zip.c b/php_zip.c index 8969397..42e9dd1 100755 --- a/php_zip.c +++ b/php_zip.c @@ -30,7 +30,6 @@ #include "ext/standard/php_string.h" #include "ext/pcre/php_pcre.h" #include "php_zip.h" -#include "lib/zip.h" #include "lib/zipint.h" /* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */ -- 1.8.1.6 From 600220bc9a4e1f4488612b47ec26cbe99c7d88dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2013 14:06:08 +0200 Subject: [PATCH 4/6] fix warning: variable 'file' set but not used [-Wunused-but-set-variable] --- php_zip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/php_zip.c b/php_zip.c index 42e9dd1..36bf8cc 100755 --- a/php_zip.c +++ b/php_zip.c @@ -1727,13 +1727,12 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* zval **zval_file = NULL; for (i = 0; i < found; i++) { - char *file, *file_stripped, *entry_name; + char *file_stripped, *entry_name; size_t entry_name_len, file_stripped_len; char entry_name_buf[MAXPATHLEN]; char *basename = NULL; if (zend_hash_index_find(Z_ARRVAL_P(return_value), i, (void **) &zval_file) == SUCCESS) { - file = Z_STRVAL_PP(zval_file); if (remove_all_path) { php_basename(Z_STRVAL_PP(zval_file), Z_STRLEN_PP(zval_file), NULL, 0, &basename, (size_t *)&file_stripped_len TSRMLS_CC); -- 1.8.1.6 From 3ceb0cc1e76338721634b07638c472d4e32f0fc8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2013 14:08:00 +0200 Subject: [PATCH 5/6] warning: 'remove_path_len' may be used uninitialized in this function [-Wmaybe-uninitialized] (just to make gcc happy) --- php_zip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php_zip.c b/php_zip.c index 36bf8cc..43bd062 100755 --- a/php_zip.c +++ b/php_zip.c @@ -1678,7 +1678,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* char *path = NULL; char *remove_path = NULL; char *add_path = NULL; - int pattern_len, add_path_len, remove_path_len, path_len = 0; + int pattern_len, add_path_len, remove_path_len = 0, path_len = 0; long remove_all_path = 0; long flags = 0; zval *options = NULL; -- 1.8.1.6 From fe8c5bbddbb60c346474cabcdaa375df781000d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2013 14:22:03 +0200 Subject: [PATCH 6/6] use public zip_error_clear instead of private _zip_error_clear --- php_zip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php_zip.c b/php_zip.c index 43bd062..2e97e84 100755 --- a/php_zip.c +++ b/php_zip.c @@ -322,7 +322,7 @@ static int php_zip_add_file(struct zip *za, const char *filename, size_t filenam if (zip_file_add(za, entry_name, zs, ZIP_FL_OVERWRITE) < 0) { return -1; } else { - _zip_error_clear(&za->error); + zip_error_clear(za); return 1; } } @@ -1660,7 +1660,7 @@ static ZIPARCHIVE_METHOD(addEmptyDir) if (zip_add_dir(intern, (const char *)s) == -1) { RETVAL_FALSE; } - _zip_error_clear(&intern->error); + zip_error_clear(intern); RETVAL_TRUE; } @@ -1886,7 +1886,7 @@ static ZIPARCHIVE_METHOD(addFromString) if (zip_add(intern, name, zs) == -1) { RETURN_FALSE; } else { - _zip_error_clear(&intern->error); + zip_error_clear(intern); RETURN_TRUE; } } -- 1.8.1.6