From: Sebastian Bergmann <sebastian@php.net>
Date: Wed, 16 Aug 2006 08:51:34 +0000 (+0000)
Subject: Sync with php_trim() API change.
X-Git-Tag: RELEASE_1_0_0RC1~1938
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8551b6d2dc49457d6c2537418879f50fdf50fc57;p=php

Sync with php_trim() API change.
---

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index d345b11856..6c8f6422cf 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -453,7 +453,7 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
 			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;
 		}
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 935f6119ed..8376ee81ce 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -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)) {
 		/* 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 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
 					}
 				}
 				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;
 			}