moriyoshi Sun, 19 Dec 2010 17:29:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306460
Log:
WS
Changed paths:
U php/php-src/trunk/Zend/zend_multibyte.c
Modified: php/php-src/trunk/Zend/zend_multibyte.c
===================================================================
--- php/php-src/trunk/Zend/zend_multibyte.c 2010-12-19 17:28:57 UTC (rev
306459)
+++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-19 17:29:21 UTC (rev
306460)
@@ -32,7 +32,7 @@
static const char *dummy_encoding_name_getter(const zend_encoding *encoding)
{
- return NULL;
+ return NULL;
}
static int dummy_encoding_lexer_compatibility_checker(const zend_encoding
*encoding)
@@ -66,9 +66,9 @@
}
static zend_multibyte_functions multibyte_functions = {
- NULL,
+ NULL,
dummy_encoding_fetcher,
- dummy_encoding_name_getter,
+ dummy_encoding_name_getter,
dummy_encoding_lexer_compatibility_checker,
dummy_encoding_detector,
dummy_encoding_converter,
@@ -120,7 +120,7 @@
ZEND_API const zend_multibyte_functions *zend_multibyte_get_functions(TSRMLS_D)
{
- return multibyte_functions.provider_name ? &multibyte_functions: NULL;
+ return multibyte_functions.provider_name ? &multibyte_functions: NULL;
}
ZEND_API const zend_encoding *zend_multibyte_fetch_encoding(const char *name
TSRMLS_DC)
@@ -216,11 +216,11 @@
ZEND_API size_t zend_multibyte_internal_encoding_filter(unsigned char **to,
size_t *to_length, const unsigned char *from, size_t from_length TSRMLS_DC)
{
- const zend_encoding *internal_encoding =
zend_multibyte_get_internal_encoding(TSRMLS_C);
+ const zend_encoding *internal_encoding =
zend_multibyte_get_internal_encoding(TSRMLS_C);
const zend_encoding *script_encoding = LANG_SCNG(script_encoding);
- if (!internal_encoding ||
!zend_multibyte_check_lexer_compatibility(internal_encoding)) {
+ if (!internal_encoding ||
!zend_multibyte_check_lexer_compatibility(internal_encoding)) {
internal_encoding = zend_multibyte_encoding_utf8;
- }
+ }
if (!zend_multibyte_check_lexer_compatibility(script_encoding)) {
script_encoding = zend_multibyte_encoding_utf8;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
