never mind. i thought you were changing a PHP function :)
At 06:05 AM 8/16/2005 +0000, Rolland Santimano wrote:
rolland Tue Aug 16 02:05:00 2005 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/standard http_fopen_wrapper.c
Log:
Updated calls to php_trim() to provide arg for returned string type
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.154&r2=1.155&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.154
php-src/ext/simplexml/simplexml.c:1.155
--- php-src/ext/simplexml/simplexml.c:1.154 Fri Aug 12 10:08:25 2005
+++ php-src/ext/simplexml/simplexml.c Tue Aug 16 02:04:58 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.154 2005/08/12 14:08:25 sebastian Exp $ */
+/* $Id: simplexml.c,v 1.155 2005/08/16 06:04:58 rolland Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -337,7 +337,7 @@
trim_zv = *member;
zval_copy_ctor(&trim_zv);
convert_to_string(&trim_zv);
- php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv),
NULL, 0, &tmp_zv, 3 TSRMLS_CC);
+ php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv),
NULL, 0, IS_STRING, &tmp_zv, 3 TSRMLS_CC);
zval_dtor(&trim_zv);
member = &tmp_zv;
}
@@ -1736,7 +1736,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.154 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.155 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99&r2=1.100&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99
php-src/ext/standard/http_fopen_wrapper.c:1.100
--- php-src/ext/standard/http_fopen_wrapper.c:1.99 Wed Aug 3
10:08:04 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Tue Aug 16 02:04:59 2005
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99 2005/08/03 14:08:04 sniper Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.100 2005/08/16 06:04:59 rolland Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -265,7 +265,7 @@
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, NULL, 3 TSRMLS_CC);
+ tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval),
NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC);
if (strlen(tmp) > 0) {
if (!header_init) { /* Remove post headers for
redirects */
int l = strlen(tmp);
@@ -291,7 +291,7 @@
}
}
efree(tmp_c);
- tmp_c = php_trim(tmp, strlen(tmp), NULL,
0, NULL, 3 TSRMLS_CC);
+ tmp_c = php_trim(tmp, strlen(tmp), NULL,
0, IS_STRING, 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php