[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c
felipe Sat, 06 Nov 2010 18:35:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=305133 Log: - Coding standards Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c U php/php-src/trunk/ext/pcre/php_pcre.c Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c === --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2010-11-06 18:32:10 UTC (rev 305132) +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2010-11-06 18:35:38 UTC (rev 305133) @@ -755,10 +755,9 @@ efree(subpat_names); /* Did we encounter an error? */ - if(PCRE_G(error_code) == PHP_PCRE_NO_ERROR) { + if (PCRE_G(error_code) == PHP_PCRE_NO_ERROR) { RETVAL_LONG(matched); - } - else { + } else { RETVAL_FALSE; } } Modified: php/php-src/trunk/ext/pcre/php_pcre.c === --- php/php-src/trunk/ext/pcre/php_pcre.c 2010-11-06 18:32:10 UTC (rev 305132) +++ php/php-src/trunk/ext/pcre/php_pcre.c 2010-11-06 18:35:38 UTC (rev 305133) @@ -755,10 +755,9 @@ efree(subpat_names); /* Did we encounter an error? */ - if(PCRE_G(error_code) == PHP_PCRE_NO_ERROR) { + if (PCRE_G(error_code) == PHP_PCRE_NO_ERROR) { RETVAL_LONG(matched); - } - else { + } else { RETVAL_FALSE; } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c
felipe Sun, 06 Sep 2009 17:41:34 + Revision: http://svn.php.net/viewvc?view=revision&revision=288111 Log: - Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) Bug: http://bugs.php.net/49483 (Open) preg_replace 'subject' parameter listed as optional Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c U php/php-src/trunk/ext/pcre/php_pcre.c Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c === --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2009-09-06 15:56:58 UTC (rev 288110) +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2009-09-06 17:41:34 UTC (rev 288111) @@ -1836,7 +1836,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 3) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, replace) ZEND_ARG_INFO(0, subject) Modified: php/php-src/trunk/ext/pcre/php_pcre.c === --- php/php-src/trunk/ext/pcre/php_pcre.c 2009-09-06 15:56:58 UTC (rev 288110) +++ php/php-src/trunk/ext/pcre/php_pcre.c 2009-09-06 17:41:34 UTC (rev 288111) @@ -2046,7 +2046,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 3) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, replace) ZEND_ARG_INFO(0, subject) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php