[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_multibyte.c

2010-12-24 Thread Moriyoshi Koizumi 
moriyoshiFri, 24 Dec 2010 08:42:21 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306613

Log:
- Fix startup warnings.

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-24 08:38:27 UTC (rev 
306612)
+++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-24 08:42:21 UTC (rev 
306613)
@@ -52,7 +52,9 @@

 static int dummy_encoding_list_parser(const char *encoding_list, size_t 
encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int 
persistent TSRMLS_DC)
 {
-   return FAILURE;
+   *return_list = pemalloc(0, persistent);
+   return_size = 0;
+   return SUCCESS;
 }

 static const zend_encoding *dummy_internal_encoding_getter(TSRMLS_D)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_multibyte.c

2010-12-19 Thread Moriyoshi Koizumi 
moriyoshiSun, 19 Dec 2010 17:29:21 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_multibyte.c

2010-12-19 Thread Moriyoshi Koizumi 
moriyoshiMon, 20 Dec 2010 03:11:41 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306485

Log:
- Fix a bug that the script gets wrongly converted into UTF-8 when the script 
encoding is not GL-safe.

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-20 02:19:31 UTC (rev 
306484)
+++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-20 03:11:41 UTC (rev 
306485)
@@ -217,15 +217,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 *script_encoding = LANG_SCNG(script_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;
-   }
return zend_multibyte_encoding_converter(to, to_length, from, 
from_length,
-script_encoding, internal_encoding TSRMLS_CC);
+LANG_SCNG(script_encoding), internal_encoding TSRMLS_CC);
 }

 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_multibyte.c

2010-12-08 Thread Dmitry Stogov 
dmitry   Wed, 08 Dec 2010 14:49:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306081

Log:
Fixed startup errors if ext/exif is loaded without ext/mbstring

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-08 14:16:17 UTC (rev 
306080)
+++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-08 14:49:26 UTC (rev 
306081)
@@ -530,7 +530,8 @@

 static int dummy_encoding_list_checker(const char *encoding_list TSRMLS_DC)
 {
-   return 0;
+   /* ignore encoding */
+   return 1;
 }

 static const char* dummy_get_internal_encoding(TSRMLS_D)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php