mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-26 13:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync with php_trim() API change.

Browse Source
This commit is contained in:
Sebastian Bergmann 2006-08-16 08:51:34 +00:00
parent c3d1deca0b
commit 8551b6d2dc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/simplexml/simplexml.c
View File

@ -453,7 +453,7 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
trim_zv = *member; trim_zv = *member;
zval_copy_ctor(&trim_zv); zval_copy_ctor(&trim_zv);
convert_to_string_with_converter(&trim_zv, UG(utf8_conv)); convert_to_string_with_converter(&trim_zv, UG(utf8_conv));
php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0, IS_STRING, &tmp_zv, 3 TSRMLS_CC); php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0, &tmp_zv, 3 TSRMLS_CC);
zval_dtor(&trim_zv); zval_dtor(&trim_zv);
member = &tmp_zv; member = &tmp_zv;
} }

4
ext/standard/http_fopen_wrapper.c
View File

@ -350,7 +350,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval)) { Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end, /* Remove newlines and spaces from start and end,
php_trim will estrndup() */ php_trim will estrndup() */
tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC); tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), NULL, 0, NULL, 3 TSRMLS_CC);
if (strlen(tmp) > 0) { if (strlen(tmp) > 0) {
if (!header_init) { /* Remove post headers for redirects */ if (!header_init) { /* Remove post headers for redirects */
int l = strlen(tmp); int l = strlen(tmp);
@ -376,7 +376,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
} }
} }
efree(tmp_c); efree(tmp_c);
tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC); tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, NULL, 3 TSRMLS_CC);
efree(tmp); efree(tmp);
tmp = tmp_c; tmp = tmp_c;
} }