archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fix ZTS build

Browse source
This commit is contained in:
Felipe Pena 2009-08-13 20:10:18 +00:00
parent e52517d610
commit a8604e2c20
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/standard/string.c
View file

@ -1577,7 +1577,7 @@ PHPAPI size_t php_strcspn(char *s1, char *s2, char *s1_end, char *s2_end)
/* {{{ php_needle_char /* {{{ php_needle_char
*/ */
static int php_needle_char(zval *needle, char *target) static int php_needle_char(zval *needle, char *target TSRMLS_DC)
{ {
switch (Z_TYPE_P(needle)) { switch (Z_TYPE_P(needle)) {
case IS_LONG: case IS_LONG:
@ -1639,7 +1639,7 @@ PHP_FUNCTION(stristr)
found = php_stristr(haystack_dup, orig_needle, haystack_len, Z_STRLEN_P(needle)); found = php_stristr(haystack_dup, orig_needle, haystack_len, Z_STRLEN_P(needle));
efree(orig_needle); efree(orig_needle);
} else { } else {
if(php_needle_char(needle, needle_char) != SUCCESS) { if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
efree(haystack_dup); efree(haystack_dup);
RETURN_FALSE; RETURN_FALSE;
} }
@ -1687,7 +1687,7 @@ PHP_FUNCTION(strstr)
found = php_memnstr(haystack, Z_STRVAL_P(needle), Z_STRLEN_P(needle), haystack + haystack_len); found = php_memnstr(haystack, Z_STRVAL_P(needle), Z_STRLEN_P(needle), haystack + haystack_len);
} else { } else {
if(php_needle_char(needle, needle_char) != SUCCESS) { if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
RETURN_FALSE; RETURN_FALSE;
} }
needle_char[1] = 0; needle_char[1] = 0;
@ -1742,7 +1742,7 @@ PHP_FUNCTION(strpos)
Z_STRLEN_P(needle), Z_STRLEN_P(needle),
haystack + haystack_len); haystack + haystack_len);
} else { } else {
if(php_needle_char(needle, needle_char) != SUCCESS) { if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
RETURN_FALSE; RETURN_FALSE;
} }
needle_char[1] = 0; needle_char[1] = 0;
@ -1799,7 +1799,7 @@ PHP_FUNCTION(stripos)
php_strtolower(needle_dup, Z_STRLEN_P(needle)); php_strtolower(needle_dup, Z_STRLEN_P(needle));
found = php_memnstr(haystack_dup + offset, needle_dup, Z_STRLEN_P(needle), haystack_dup + haystack_len); found = php_memnstr(haystack_dup + offset, needle_dup, Z_STRLEN_P(needle), haystack_dup + haystack_len);
} else { } else {
if(php_needle_char(needle, needle_char) != SUCCESS) { if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
efree(haystack_dup); efree(haystack_dup);
RETURN_FALSE; RETURN_FALSE;
} }
@ -1842,7 +1842,7 @@ PHP_FUNCTION(strrpos)
needle = Z_STRVAL_P(zneedle); needle = Z_STRVAL_P(zneedle);
needle_len = Z_STRLEN_P(zneedle); needle_len = Z_STRLEN_P(zneedle);
} else { } else {
if(php_needle_char(zneedle, ord_needle) != SUCCESS) { if (php_needle_char(zneedle, ord_needle TSRMLS_CC) != SUCCESS) {
RETURN_FALSE; RETURN_FALSE;
} }
ord_needle[1] = '\0'; ord_needle[1] = '\0';
@ -1916,7 +1916,7 @@ PHP_FUNCTION(strripos)
needle = Z_STRVAL_P(zneedle); needle = Z_STRVAL_P(zneedle);
needle_len = Z_STRLEN_P(zneedle); needle_len = Z_STRLEN_P(zneedle);
} else { } else {
if(php_needle_char(zneedle, ord_needle) != SUCCESS) { if (php_needle_char(zneedle, ord_needle TSRMLS_CC) != SUCCESS) {
RETURN_FALSE; RETURN_FALSE;
} }
ord_needle[1] = '\0'; ord_needle[1] = '\0';
@ -2019,7 +2019,7 @@ PHP_FUNCTION(strrchr)
found = zend_memrchr(haystack, *Z_STRVAL_P(needle), haystack_len); found = zend_memrchr(haystack, *Z_STRVAL_P(needle), haystack_len);
} else { } else {
char needle_chr; char needle_chr;
if(php_needle_char(needle, &needle_chr) != SUCCESS) { if (php_needle_char(needle, &needle_chr TSRMLS_CC) != SUCCESS) {
RETURN_FALSE; RETURN_FALSE;
} }