cvs: php-src(PHP_5_2) /ext/standard reg.c

felipe Sun Apr 20 01:43:18 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard reg.c Log: - Better error message http://cvs.php.net/viewvc.cgi/php-src/ext/standard/reg.c?r1=1.82.2.3.2.4&r2=1.82.2.3.2.5&diff_format=u Index: php-src/ext/standard/reg.c diff -u php-src/ext/standard/reg.c:1.82.2.3.2.4 php-src/ext/standard/reg.c:1.82.2.3.2.5 --- php-src/ext/standard/reg.c:1.82.2.3.2.4 Wed Apr 9 13:47:35 2008 +++ php-src/ext/standard/reg.c Sun Apr 20 01:43:18 2008 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.82.2.3.2.4 2008/04/09 13:47:35 felipe Exp $ */ +/* $Id: reg.c,v 1.82.2.3.2.5 2008/04/20 01:43:18 felipe Exp $ */ #include <stdio.h> #include <ctype.h> @@ -564,12 +564,8 @@ } else if (subs[0].rm_so == 0 && subs[0].rm_eo == 0) { /* No more matches */ regfree(&re); - - if (icase) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Regular Expression to spliti()"); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Regular Expression to split()"); - } + + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Regular Expression"); zend_hash_destroy(Z_ARRVAL_P(return_value)); efree(Z_ARRVAL_P(return_value));