andrei Wed Jun 21 17:10:13 2006 UTC
Modified files:
/php-src/main/streams streams.c
Log:
Typos.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.125&r2=1.126&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.125
php-src/main/streams/streams.c:1.126
--- php-src/main/streams/streams.c:1.125 Tue Jun 20 18:09:33 2006
+++ php-src/main/streams/streams.c Wed Jun 21 17:10:13 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125 2006/06/20 18:09:33 bjori Exp $ */
+/* $Id: streams.c,v 1.126 2006/06/21 17:10:13 andrei Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1221,7 +1221,7 @@
/* Use runtime_encoding to map to binary */
num_conv =
zend_convert_from_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &str,
&len, buf.u, buflen, &status);
if (U_FAILURE(status)) {
- zend_raise_conversion_error_ex("Unable to convert data
to be writen", ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
+ zend_raise_conversion_error_ex("Unable to convert data
to be written", ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
ZEND_FROM_UNICODE, num_conv, (UG(from_error_mode) & ZEND_CONV_ERROR_EXCEPTION)
TSRMLS_CC);
} else {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%d
character unicode buffer downcoded for binary stream runtime_encoding", ulen);
@@ -1579,7 +1579,7 @@
if (U_FAILURE(status)) {
/* Memory overflow isn't a problem becuase
MAX_BYTES_FOR_STRING was allocated,
anything else is a more serious problem */
- zend_raise_conversion_error_ex("Unable to
convert unicode character using output_encoding, at least one character was
lost",
+ zend_raise_conversion_error_ex("Unable to
convert Unicode character using output_encoding, at least one character was
lost",
conv,
ZEND_FROM_UNICODE, len, (UG(from_error_mode) & ZEND_CONV_ERROR_EXCEPTION)
TSRMLS_CC);
}
if (outbuf > outbuf_start) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
