com php-src: Revert "Fixed incompatible pointer type": ext/phar/phar_object.c

From: Date: Thu, 28 Aug 2014 06:56:25 +0000
Subject: com php-src: Revert "Fixed incompatible pointer type": ext/phar/phar_object.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81246@lists.php.net to get a copy of this message
Commit: de4282fa3e6c47aec15216b878d7d2e185621b01 Author: Xinchen Hui <laruence@php.net> Thu, 28 Aug 2014 14:56:25 +0800 Parents: 4a12b4cef9c21dba91038266192d400fcf992cc4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de4282fa3e6c47aec15216b878d7d2e185621b01 Log: Revert "Fixed incompatible pointer type" This reverts commit 007406c775b527a334a0964a624810afeb599ed5. Changed paths: M ext/phar/phar_object.c Diff: diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index ec4c288..0ce1c3f 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -3420,7 +3420,7 @@ PHP_METHOD(Phar, copy) } } - if (phar_path_check(&newfile, (int *) &newfile_len, &pcr_error) > pcr_is_ok) { + if (phar_path_check(&newfile, &newfile_len, &pcr_error) > pcr_is_ok) { zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "file \"%s\" contains invalid characters %s, cannot be copied from \"%s\" in phar %s", newfile, pcr_error, oldfile, phar_obj->archive->fname); RETURN_FALSE;

« previous php.cvs (#81246) next »