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/dom/node.c | |
| 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/dom/node.c')
| -rw-r--r-- | ext/dom/node.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/dom/node.c b/ext/dom/node.c index 6d16579e27..4583438742 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -1785,7 +1785,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) UErrorCode errCode = 0; if (Z_TYPE_PP(tmpns) == IS_UNICODE) { - zend_convert_from_unicode(UG(utf8_conv), &nschar, &nschar_len, Z_USTRVAL_PP(tmpns), Z_USTRLEN_PP(tmpns), &errCode); + zend_unicode_to_string_ex(UG(utf8_conv), &nschar, &nschar_len, Z_USTRVAL_PP(tmpns), Z_USTRLEN_PP(tmpns), &errCode); } else { nschar = Z_STRVAL_PP(tmpns); } @@ -1800,7 +1800,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) int tmp_prefix_len; errCode = 0; - zend_convert_from_unicode(UG(utf8_conv), &tmp_prefix, &tmp_prefix_len, prefix.u, prefix_key_len, &errCode); + zend_unicode_to_string_ex(UG(utf8_conv), &tmp_prefix, &tmp_prefix_len, prefix.u, prefix_key_len, &errCode); xmlXPathRegisterNs(ctxp, (xmlChar *)tmp_prefix, (xmlChar *)nschar); efree(tmp_prefix); } @@ -1815,7 +1815,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) if (Z_TYPE_PP(zxquery) == IS_UNICODE) { UErrorCode errCode = 0; - zend_convert_from_unicode(UG(utf8_conv), &xquery, &xquery_len, Z_USTRVAL_PP(zxquery), Z_USTRLEN_PP(zxquery), &errCode); + zend_unicode_to_string_ex(UG(utf8_conv), &xquery, &xquery_len, Z_USTRVAL_PP(zxquery), Z_USTRLEN_PP(zxquery), &errCode); } else { xquery = Z_STRVAL_PP(zxquery); } @@ -1857,7 +1857,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) char *prefix; int prfeix_len; - zend_convert_from_unicode(UG(utf8_conv), &prefix, &prfeix_len, Z_USTRVAL_PP(tmpns), Z_USTRLEN_PP(tmpns), &errCode); + zend_unicode_to_string_ex(UG(utf8_conv), &prefix, &prfeix_len, Z_USTRVAL_PP(tmpns), Z_USTRLEN_PP(tmpns), &errCode); inclusive_ns_prefixes[nscount++] = prefix; } zend_hash_move_forward(Z_ARRVAL_P(ns_prefixes)); |