diff options
| author | andrey <andrey@php.net> | 2012-09-25 16:36:21 +0200 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-09-25 16:36:21 +0200 |
| commit | 6074df91c6ab80a1fae7c7e8ff5be1c1db342af0 (patch) | |
| tree | b7969320ed12e70ade1b9109a4bcbab286ecd318 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 571b46bff68925f15f578147278b43c6f88083f0 (diff) | |
| download | php-git-6074df91c6ab80a1fae7c7e8ff5be1c1db342af0.tar.gz | |
remove old unicode code, that is was compiled out by using a macro
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 8dccf37c4b..f2f7ab98eb 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -40,39 +40,8 @@ static zend_function_entry mysqlnd_functions[] = { /* {{{ mysqlnd_minfo_print_hash */ -#if MYSQLND_UNICODE -PHPAPI void mysqlnd_minfo_print_hash(zval *values) -{ - zval **values_entry; - HashPosition pos_values; - - zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values); - while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), - (void **)&values_entry, &pos_values) == SUCCESS) { - zstr string_key; - uint string_key_len; - ulong num_key; - int s_len; - char *s = NULL; - - TSRMLS_FETCH(); - zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key, &string_key_len, &num_key, 0, &pos_values); - - convert_to_string(*values_entry); - - if (zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), - &s, &s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) { - php_info_print_table_row(2, s, Z_STRVAL_PP(values_entry)); - } - if (s) { - mnd_efree(s); - } - - zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos_values); - } -} -#else -PHPAPI void mysqlnd_minfo_print_hash(zval *values) +PHPAPI void +mysqlnd_minfo_print_hash(zval *values) { zval **values_entry; HashPosition pos_values; @@ -91,7 +60,6 @@ PHPAPI void mysqlnd_minfo_print_hash(zval *values) zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos_values); } } -#endif /* }}} */ |