cvs: php4 /ext/standard php_string.h string.c

sterling Tue Sep 4 05:35:53 2001 EDT Modified files: /php4/ext/standard string.c php_string.h Log: update php_trim as well... Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.232 php4/ext/standard/string.c:1.233 --- php4/ext/standard/string.c:1.232 Tue Sep 4 05:33:30 2001 +++ php4/ext/standard/string.c Tue Sep 4 05:35:53 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.232 2001/09/04 09:33:30 sterling Exp $ */ +/* $Id: string.c,v 1.233 2001/09/04 09:35:53 sterling Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -488,7 +488,7 @@ /* {{{ php_trim Compatibility function, ports old-API to new one. (DEPRECATED) */ -void php_trim(zval *str, zval *return_value, int mode TSRMLS_DC) +void php_trim(zval **str, zval *return_value, int mode TSRMLS_DC) { php_trim2(str, NULL, return_value, mode TSRMLS_CC); } Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.50 php4/ext/standard/php_string.h:1.51 --- php4/ext/standard/php_string.h:1.50 Tue Sep 4 05:33:30 2001 +++ php4/ext/standard/php_string.h Tue Sep 4 05:35:53 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.50 2001/09/04 09:33:30 sterling Exp $ */ +/* $Id: php_string.h,v 1.51 2001/09/04 09:35:53 sterling Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -113,7 +113,7 @@ PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len); PHPAPI char *php_str_to_str(char *haystack, int length, char *needle, int needle_len, char *str, int str_len, int *_new_length); -PHPAPI void php_trim(zval *str, zval *return_value, int mode TSRMLS_DC); +PHPAPI void php_trim(zval **str, zval *return_value, int mode TSRMLS_DC); PHPAPI void php_trim2(zval **str, zval **what, zval *return_value, int mode TSRMLS_DC); PHPAPI void php_strip_tags(char *rbuf, int len, int state, char *allow, int allow_len);