implement zend_unicode_to_string() and zend_string_to_unicode()

part #2 (of 2)
This commit is contained in:
Antony Dovgal 2006-08-08 16:59:11 +00:00
parent f5715ee86f
commit dbe2092313
18 changed files with 41 additions and 41 deletions

View file

@ -60,7 +60,7 @@ static PHP_FUNCTION(unicode_decode)
zend_set_converter_error_mode(conv, ZEND_TO_UNICODE, flags);
status = U_ZERO_ERROR;
num_conv = zend_convert_to_unicode(conv, &dest, &dest_len, str, str_len, &status);
num_conv = zend_string_to_unicode_ex(conv, &dest, &dest_len, str, str_len, &status);
if (U_FAILURE(status)) {
zend_raise_conversion_error_ex("could not decode binary string", conv, ZEND_TO_UNICODE, num_conv TSRMLS_CC);
efree(dest);
@ -111,7 +111,7 @@ static PHP_FUNCTION(unicode_encode)
zend_set_converter_subst_char(conv, UG(from_subst_char));
status = U_ZERO_ERROR;
num_conv = zend_convert_from_unicode(conv, &dest, &dest_len, uni, uni_len, &status);
num_conv = zend_unicode_to_string_ex(conv, &dest, &dest_len, uni, uni_len, &status);
if (U_FAILURE(status)) {
int32_t offset = u_countChar32(uni, num_conv);
zend_raise_conversion_error_ex("could not encode Unicode string", conv, ZEND_FROM_UNICODE, offset TSRMLS_CC);