diff options
author | Moriyoshi Koizumi <moriyoshi@php.net> | 2011-03-06 07:00:30 +0000 |
---|---|---|
committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2011-03-06 07:00:30 +0000 |
commit | cdb9ee0d1a5ecb843b320c9effb81207f4280795 (patch) | |
tree | 001d369b5480329ae9214e3d1256181957b73d5f /Zend/zend_multibyte.c | |
parent | 6ba343aeff1af7fac3603f56c9d9b25320cb88b1 (diff) | |
download | php-git-cdb9ee0d1a5ecb843b320c9effb81207f4280795.tar.gz |
Fix zend.multibyte oddities. Hope this will address all the known problems.
Diffstat (limited to 'Zend/zend_multibyte.c')
-rw-r--r-- | Zend/zend_multibyte.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c index e28d600ade..775ea78f5e 100644 --- a/Zend/zend_multibyte.c +++ b/Zend/zend_multibyte.c @@ -206,26 +206,6 @@ ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, return SUCCESS; } -ZEND_API size_t zend_multibyte_script_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); - if (!internal_encoding || !zend_multibyte_check_lexer_compatibility(internal_encoding)) { - internal_encoding = zend_multibyte_encoding_utf8; - } - return zend_multibyte_encoding_converter(to, to_length, from, from_length, internal_encoding, LANG_SCNG(script_encoding) TSRMLS_CC); -} - -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); - if (!internal_encoding || !zend_multibyte_check_lexer_compatibility(internal_encoding)) { - internal_encoding = zend_multibyte_encoding_utf8; - } - return zend_multibyte_encoding_converter(to, to_length, from, from_length, -LANG_SCNG(script_encoding), internal_encoding TSRMLS_CC); -} - /* * Local variables: * tab-width: 4 |