andrei Fri Aug 19 13:53:07 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
Use RETVAL_ASCII_STRINGL() here.
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.467&r2=1.468&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.467 php-src/ext/standard/string.c:1.468
--- php-src/ext/standard/string.c:1.467 Fri Aug 19 06:59:19 2005
+++ php-src/ext/standard/string.c Fri Aug 19 13:53:03 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.467 2005/08/19 10:59:19 rolland Exp $ */
+/* $Id: string.c,v 1.468 2005/08/19 17:53:03 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -200,12 +200,9 @@
RETURN_FALSE;
}
+ RETVAL_ASCII_STRINGL(result, newlen, 0);
if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(result, newlen+1
ZEND_FILE_LINE_CC);
efree(result);
- RETVAL_UNICODEL(u_temp, newlen, 0);
- } else {
- RETURN_STRINGL(result, newlen, 0);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
