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/sqlite/sqlite.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/sqlite/sqlite.c')
| -rw-r--r-- | ext/sqlite/sqlite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index abf0605244..1c12d79437 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -1689,7 +1689,7 @@ PHP_FUNCTION(sqlite_fetch_column_types) UChar *u_str; int u_len; - zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, tmp, strlen(tmp), &status); + zend_string_to_unicode_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, tmp, strlen(tmp), &status); if (result_type == PHPSQLITE_ASSOC) { add_assoc_unicode(return_value, colname, u_str, 1); } @@ -1857,7 +1857,7 @@ static void php_sqlite_fetch_array(struct php_sqlite_result *res, int mode, zend UChar *u_str; int u_len; - zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, (char*)rowdata[j], strlen((char*)rowdata[j]), &status); + zend_string_to_unicode_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, (char*)rowdata[j], strlen((char*)rowdata[j]), &status); ZVAL_UNICODEL(decoded, u_str, u_len, 0); if (!buffered) { efree((char *)rowdata[j]); @@ -1945,7 +1945,7 @@ static void php_sqlite_fetch_column(struct php_sqlite_result *res, zval *which, UChar *u_str; int u_len; - zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, (char*)rowdata[j], strlen((char*)rowdata[j]), &status); + zend_string_to_unicode_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, (char*)rowdata[j], strlen((char*)rowdata[j]), &status); RETVAL_UNICODEL(u_str, u_len, 0); if (!res->buffered) { efree((char *)rowdata[j]); @@ -2277,7 +2277,7 @@ static void php_sqlite_fetch_single(struct php_sqlite_result *res, zend_bool dec UChar *u_str; int u_len; - zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, decoded, decoded_len, &status); + zend_string_to_unicode_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len, decoded, decoded_len, &status); if (free_decoded) { efree(decoded); } |