felipe Sun Feb 3 14:30:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard string.c Log: Fixed reference problem (variable were converted) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.14&r2=1.445.2.14.2.69.2.15&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.14 php-src/ext/standard/string.c:1.445.2.14.2.69.2.15 --- php-src/ext/standard/string.c:1.445.2.14.2.69.2.14 Fri Feb 1 12:28:43 2008 +++ php-src/ext/standard/string.c Sun Feb 3 14:30:25 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.445.2.14.2.69.2.14 2008/02/01 12:28:43 felipe Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69.2.15 2008/02/03 14:30:25 felipe Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1702,10 +1702,8 @@ return; } - SEPARATE_ZVAL(haystack); - SEPARATE_ZVAL(needle); - - convert_to_string_ex(haystack); + SEPARATE_ZVAL(haystack); + convert_to_string(*haystack); haystack_orig = estrndup(Z_STRVAL_PP(haystack), Z_STRLEN_PP(haystack)); @@ -1716,19 +1714,14 @@ RETURN_FALSE; } - found = php_stristr(Z_STRVAL_PP(haystack), - Z_STRVAL_PP(needle), - Z_STRLEN_PP(haystack), - Z_STRLEN_PP(needle)); + found = php_stristr(Z_STRVAL_PP(haystack), Z_STRVAL_PP(needle), Z_STRLEN_PP(haystack), Z_STRLEN_PP(needle)); } else { - convert_to_long_ex(needle); + SEPARATE_ZVAL(needle); + convert_to_long(*needle); needle_char[0] = (char) Z_LVAL_PP(needle); needle_char[1] = 0; - found = php_stristr(Z_STRVAL_PP(haystack), - needle_char, - Z_STRLEN_PP(haystack), - 1); + found = php_stristr(Z_STRVAL_PP(haystack), needle_char, Z_STRLEN_PP(haystack), 1); } if (found) { @@ -1760,7 +1753,8 @@ return; } - convert_to_string_ex(haystack); + SEPARATE_ZVAL(haystack); + convert_to_string(*haystack); if (Z_TYPE_PP(needle) == IS_STRING) { if (!Z_STRLEN_PP(needle)) { @@ -1768,19 +1762,14 @@ RETURN_FALSE; } - found = php_memnstr(Z_STRVAL_PP(haystack), - Z_STRVAL_PP(needle), - Z_STRLEN_PP(needle), - Z_STRVAL_PP(haystack) + Z_STRLEN_PP(haystack)); + found = php_memnstr(Z_STRVAL_PP(haystack), Z_STRVAL_PP(needle), Z_STRLEN_PP(needle), Z_STRVAL_PP(haystack) + Z_STRLEN_PP(haystack)); } else { - convert_to_long_ex(needle); + SEPARATE_ZVAL(needle); + convert_to_long(*needle); needle_char[0] = (char) Z_LVAL_PP(needle); needle_char[1] = 0; - found = php_memnstr(Z_STRVAL_PP(haystack), - needle_char, - 1, - Z_STRVAL_PP(haystack) + Z_STRLEN_PP(haystack)); + found = php_memnstr(Z_STRVAL_PP(haystack), needle_char, 1, Z_STRVAL_PP(haystack) + Z_STRLEN_PP(haystack)); } if (found) { @@ -1790,9 +1779,8 @@ } else { RETURN_STRINGL(found, Z_STRLEN_PP(haystack) - found_offset, 1); } - } else { - RETURN_FALSE; } + RETURN_FALSE; } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php