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_result.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_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index ddfe427d45..e2c8c2c0af 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -910,21 +910,18 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int flag */ if (zend_hash_key->is_numeric == FALSE) { #if PHP_MAJOR_VERSION >= 6 - if (UG(unicode)) { - zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE, - zend_hash_key->ustr, - zend_hash_key->ulen + 1, - zend_hash_key->key, - (void *) &data, sizeof(zval *), NULL); - } else + zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE, + zend_hash_key->ustr, + zend_hash_key->ulen + 1, + zend_hash_key->key, + (void *) &data, sizeof(zval *), NULL); +#else + zend_hash_quick_update(Z_ARRVAL_P(row), + field->name, + field->name_length + 1, + zend_hash_key->key, + (void *) &data, sizeof(zval *), NULL); #endif - { - zend_hash_quick_update(Z_ARRVAL_P(row), - field->name, - field->name_length + 1, - zend_hash_key->key, - (void *) &data, sizeof(zval *), NULL); - } } else { zend_hash_index_update(Z_ARRVAL_P(row), zend_hash_key->key, @@ -1143,21 +1140,18 @@ mysqlnd_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int flags, */ if (zend_hash_key->is_numeric == FALSE) { #if PHP_MAJOR_VERSION >= 6 - if (UG(unicode)) { - zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE, - zend_hash_key->ustr, - zend_hash_key->ulen + 1, - zend_hash_key->key, - (void *) &data, sizeof(zval *), NULL); - } else + zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE, + zend_hash_key->ustr, + zend_hash_key->ulen + 1, + zend_hash_key->key, + (void *) &data, sizeof(zval *), NULL); +#else + zend_hash_quick_update(Z_ARRVAL_P(row), + field->name, + field->name_length + 1, + zend_hash_key->key, + (void *) &data, sizeof(zval *), NULL); #endif - { - zend_hash_quick_update(Z_ARRVAL_P(row), - field->name, - field->name_length + 1, - zend_hash_key->key, - (void *) &data, sizeof(zval *), NULL); - } } else { zend_hash_index_update(Z_ARRVAL_P(row), zend_hash_key->key, @@ -1419,21 +1413,18 @@ mysqlnd_fetch_row_async_buffered(MYSQLND_RES *result, void *param, unsigned int */ if (result->meta->zend_hash_keys[i].is_numeric == FALSE) { #if PHP_MAJOR_VERSION >= 6 - if (UG(unicode)) { - zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE, - result->meta->zend_hash_keys[i].ustr, - result->meta->zend_hash_keys[i].ulen + 1, - result->meta->zend_hash_keys[i].key, - (void *) &data, sizeof(zval *), NULL); - } else + zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE, + result->meta->zend_hash_keys[i].ustr, + result->meta->zend_hash_keys[i].ulen + 1, + result->meta->zend_hash_keys[i].key, + (void *) &data, sizeof(zval *), NULL); +#else + zend_hash_quick_update(Z_ARRVAL_P(row), + result->meta->fields[i].name, + result->meta->fields[i].name_length + 1, + result->meta->zend_hash_keys[i].key, + (void *) &data, sizeof(zval *), NULL); #endif - { - zend_hash_quick_update(Z_ARRVAL_P(row), - result->meta->fields[i].name, - result->meta->fields[i].name_length + 1, - result->meta->zend_hash_keys[i].key, - (void *) &data, sizeof(zval *), NULL); - } } else { zend_hash_index_update(Z_ARRVAL_P(row), result->meta->zend_hash_keys[i].key, |