diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-27 19:28:26 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-27 19:28:26 +0000 |
| commit | 04c90a0f510b0524ea1b4151841d41208520a48e (patch) | |
| tree | ebf20eab8aedcca2b0ba59126d7b2ec27187d055 /ext/mysqlnd/mysqlnd_statistics.c | |
| parent | fe23a6b147175ec35a40053ac362e37c6f6148f0 (diff) | |
| download | php-git-04c90a0f510b0524ea1b4151841d41208520a48e.tar.gz | |
- Removed:
- UG(unicode) checks
- Changed:
- ZEND_STR_TYPE -> IS_UNICODE
- convert_to_text -> convert_to_unicode
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index fd9c455aee..0807b3d017 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -168,7 +168,7 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value TS sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]); #if PHP_MAJOR_VERSION >= 6 - if (UG(unicode)) { + { UChar *ustr, *tstr; int ulen, tlen; @@ -178,12 +178,11 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value TS add_u_assoc_unicode_ex(return_value, IS_UNICODE, ZSTR(ustr), ulen, tstr, 1); efree(ustr); efree(tstr); - } else -#endif - { - add_assoc_string_ex(return_value, mysqlnd_stats_values_names[i].s, - mysqlnd_stats_values_names[i].l + 1, tmp, 1); } +#else + add_assoc_string_ex(return_value, mysqlnd_stats_values_names[i].s, + mysqlnd_stats_values_names[i].l + 1, tmp, 1); +#endif } } /* }}} */ |