diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-24 22:39:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-24 22:39:59 +0300 |
| commit | ad4fa8f75810facff8bea509249a735232235443 (patch) | |
| tree | 13b4b2f3df2a2df85a8d3b9702024ac8213f37a7 /ext/mysqli/mysqli_embedded.c | |
| parent | abf6a0b376b42e0ce60da039b11c6fdf994431fb (diff) | |
| download | php-git-ad4fa8f75810facff8bea509249a735232235443.tar.gz | |
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
Diffstat (limited to 'ext/mysqli/mysqli_embedded.c')
| -rw-r--r-- | ext/mysqli/mysqli_embedded.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/mysqli/mysqli_embedded.c b/ext/mysqli/mysqli_embedded.c index 97232ed0cb..e200a3abf6 100644 --- a/ext/mysqli/mysqli_embedded.c +++ b/ext/mysqli/mysqli_embedded.c @@ -51,16 +51,16 @@ PHP_FUNCTION(mysqli_embedded_server_start) RETURN_TRUE; } /* get arguments */ - if ((argc = zend_hash_num_elements(HASH_OF(args)))) { + if ((argc = zend_hash_num_elements(Z_ARRVAL_P(args)))) { arguments = safe_emalloc(sizeof(char *), argc + 1, 0); arguments[0] = NULL; - zend_hash_internal_pointer_reset_ex(HASH_OF(args), &pos); + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(args), &pos); - for (index = 0;; zend_hash_move_forward_ex(HASH_OF(args), &pos)) { + for (index = 0;; zend_hash_move_forward_ex(Z_ARRVAL_P(args), &pos)) { zval **item; - if (zend_hash_get_current_data_ex(HASH_OF(args), (void **) &item, &pos) == FAILURE) { + if (zend_hash_get_current_data_ex(Z_ARRVAL_P(args), (void **) &item, &pos) == FAILURE) { break; } @@ -72,16 +72,16 @@ PHP_FUNCTION(mysqli_embedded_server_start) } /* get groups */ - if ((zend_hash_num_elements(HASH_OF(grps)))) { - groups = safe_emalloc(sizeof(char *), zend_hash_num_elements(HASH_OF(grps)) + 1, 0); + if ((zend_hash_num_elements(Z_ARRVAL_P(grps)))) { + groups = safe_emalloc(sizeof(char *), zend_hash_num_elements(Z_ARRVAL_P(grps)) + 1, 0); groups[0] = NULL; - zend_hash_internal_pointer_reset_ex(HASH_OF(grps), &pos); + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(grps), &pos); - for (index = 0;; zend_hash_move_forward_ex(HASH_OF(grps), &pos)) { + for (index = 0;; zend_hash_move_forward_ex(Z_ARRVAL_P(grps), &pos)) { zval ** item; - if (zend_hash_get_current_data_ex(HASH_OF(grps), (void **) &item, &pos) == FAILURE) { + if (zend_hash_get_current_data_ex(Z_ARRVAL_P(grps), (void **) &item, &pos) == FAILURE) { break; } |