sebastian Wed Aug 16 08:51:34 2006 UTC Modified files: /php-src/ext/simplexml simplexml.c /php-src/ext/standard http_fopen_wrapper.c Log: Sync with php_trim() API change. http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.217&r2=1.218&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.217 php-src/ext/simplexml/simplexml.c:1.218 --- php-src/ext/simplexml/simplexml.c:1.217 Mon Aug 14 11:58:49 2006 +++ php-src/ext/simplexml/simplexml.c Wed Aug 16 08:51:34 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.217 2006/08/14 11:58:49 rrichards Exp $ */ +/* $Id: simplexml.c,v 1.218 2006/08/16 08:51:34 sebastian Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -453,7 +453,7 @@ trim_zv = *member; zval_copy_ctor(&trim_zv); 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); member = &tmp_zv; } @@ -2339,7 +2339,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.217 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.218 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.117&r2=1.118&diff_format=u Index: php-src/ext/standard/http_fopen_wrapper.c diff -u php-src/ext/standard/http_fopen_wrapper.c:1.117 php-src/ext/standard/http_fopen_wrapper.c:1.118 --- php-src/ext/standard/http_fopen_wrapper.c:1.117 Thu Jun 29 14:42:30 2006 +++ php-src/ext/standard/http_fopen_wrapper.c Wed Aug 16 08:51:34 2006 @@ -19,7 +19,7 @@ | Sara Golemon <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.117 2006/06/29 14:42:30 bjori Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.118 2006/08/16 08:51:34 sebastian Exp $ */ #include "php.h" #include "php_globals.h" @@ -350,7 +350,7 @@ Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval)) { /* Remove newlines and spaces from start and end, 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 (!header_init) { /* Remove post headers for redirects */ int l = strlen(tmp); @@ -376,7 +376,7 @@ } } 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); tmp = tmp_c; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php