diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-08 16:59:11 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-08 16:59:11 +0000 |
| commit | dbe20923139afd2673e35ab3fbdc6fd0b99c81bf (patch) | |
| tree | 2cfcbcb1ecd50c01c01df4dd8ffb9f3748c6fab7 /ext/soap | |
| parent | f5715ee86f241510cf51c9ed17aa456eb19d1ac2 (diff) | |
| download | php-git-dbe20923139afd2673e35ab3fbdc6fd0b99c81bf.tar.gz | |
implement zend_unicode_to_string() and zend_string_to_unicode()
part #2 (of 2)
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/php_encoding.c | 4 | ||||
| -rw-r--r-- | ext/soap/php_http.c | 4 | ||||
| -rw-r--r-- | ext/soap/soap.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 99b70139b4..91bf447384 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -3170,7 +3170,7 @@ static encodePtr get_array_type(xmlNodePtr node, zval *array, smart_str *type TS ALLOC_INIT_ZVAL(tmp); Z_TYPE_P(tmp) = IS_STRING; - zend_convert_from_unicode(UG(utf8_conv), &Z_STRVAL_P(tmp), &Z_STRLEN_P(tmp), Z_USTRVAL_P(cur_stype), Z_USTRLEN_P(cur_stype), &status); + zend_unicode_to_string_ex(UG(utf8_conv), &Z_STRVAL_P(tmp), &Z_STRLEN_P(tmp), Z_USTRVAL_P(cur_stype), Z_USTRLEN_P(cur_stype), &status); cur_stype = tmp; } else { cur_stype->refcount++; @@ -3183,7 +3183,7 @@ static encodePtr get_array_type(xmlNodePtr node, zval *array, smart_str *type TS ALLOC_INIT_ZVAL(tmp); Z_TYPE_P(tmp) = IS_STRING; - zend_convert_from_unicode(UG(utf8_conv), &Z_STRVAL_P(tmp), &Z_STRLEN_P(tmp), Z_USTRVAL_P(cur_ns), Z_USTRLEN_P(cur_ns), &status); + zend_unicode_to_string_ex(UG(utf8_conv), &Z_STRVAL_P(tmp), &Z_STRLEN_P(tmp), Z_USTRVAL_P(cur_ns), Z_USTRLEN_P(cur_ns), &status); cur_ns = tmp; } else { cur_ns->refcount++; diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index b88c17b013..6032fa0cb4 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -632,7 +632,7 @@ try_again: char *res; int res_len; - zend_convert_from_unicode(UG(utf8_conv), &res, &res_len, key.u, key_len-1, &status); + zend_unicode_to_string_ex(UG(utf8_conv), &res, &res_len, key.u, key_len-1, &status); smart_str_appendl(&soap_headers, res, res_len); efree(res); } @@ -644,7 +644,7 @@ try_again: char *res; int res_len; - zend_convert_from_unicode(UG(utf8_conv), &res, &res_len, Z_USTRVAL_PP(value), Z_USTRLEN_PP(value), &status); + zend_unicode_to_string_ex(UG(utf8_conv), &res, &res_len, Z_USTRVAL_PP(value), Z_USTRLEN_PP(value), &status); smart_str_appendl(&soap_headers, res, res_len); efree(res); } diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 538b05e31a..5593a9bc41 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -308,7 +308,7 @@ char* soap_unicode_to_string(UChar *ustr, int ustr_len TSRMLS_DC) char *tmp; int tmp_len; - zend_convert_from_unicode(UG(utf8_conv), &tmp, &tmp_len, ustr, ustr_len, &errCode); + zend_unicode_to_string_ex(UG(utf8_conv), &tmp, &tmp_len, ustr, ustr_len, &errCode); return tmp; } |