diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-14 20:47:00 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-14 20:47:00 -0700 |
| commit | 3c166c47584c7a7eb8c1ce42ea05a8a5677da028 (patch) | |
| tree | 7d7e5cf3f27e24c669e6f5272ed4354f2dc0722d /ext/zip | |
| parent | 759517651ec5fb09349a3653435dc9ddd0fc53b5 (diff) | |
| parent | 39612afc72623e89a2bc595c9be4be497568d1be (diff) | |
| download | php-git-3c166c47584c7a7eb8c1ce42ea05a8a5677da028.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
Diffstat (limited to 'ext/zip')
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index b73082ba71..969bac1aa6 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1654,7 +1654,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 = 0, remove_path_len = 0, path_len = 0; long remove_all_path = 0; long flags = 0; zval *options = NULL; |