diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-09 12:31:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-09 12:31:35 +0200 |
| commit | 21e01f2b70d133acffd82e505f70b65a996b0fd0 (patch) | |
| tree | b0c599ed18b2d9205cc7d7bb8fb5e8d1579ae1e7 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 6acfaa982bfc88c478013cdca982682d8df0c7cd (diff) | |
| parent | ad2ef3d97edab0d0ce034e65b7e3da1a38cc15dd (diff) | |
| download | php-git-21e01f2b70d133acffd82e505f70b65a996b0fd0.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 7712f1ecb8..1a4e67f5eb 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -107,17 +107,17 @@ static void mysqlnd_minfo_dump_api_plugins(smart_str * buffer TSRMLS_DC) { HashTable *ht = mysqlnd_reverse_api_get_api_list(TSRMLS_C); - Bucket *p; + HashPosition pos; + MYSQLND_REVERSE_API **ext; - p = ht->pListHead; - while(p != NULL) { - MYSQLND_REVERSE_API * ext = *(MYSQLND_REVERSE_API **) p->pData; + for (zend_hash_internal_pointer_reset_ex(ht, &pos); + zend_hash_get_current_data_ex(ht, (void **) &ext, &pos); + zend_hash_move_forward_ex(ht, &pos) + ) { if (buffer->len) { smart_str_appendc(buffer, ','); } - smart_str_appends(buffer, ext->module->name); - - p = p->pListNext; + smart_str_appends(buffer, (*ext)->module->name); } } /* }}} */ |