diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-03-04 12:35:49 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-03-04 12:46:06 +0100 |
commit | 33ef3d64dac366733f2af40d5bce2bac4e5bca1e (patch) | |
tree | 0e2e15e6c81ea5e688b61773bc6f0f2b6a3a8b6e /sapi/phpdbg/phpdbg_wait.c | |
parent | 22ec3bcebdf17fc23cc68bf69507994699912045 (diff) | |
download | php-git-33ef3d64dac366733f2af40d5bce2bac4e5bca1e.tar.gz |
Use separate typedef for bucket comparison function
Avoid performing the same casting dance inside each sort compare
function.
Diffstat (limited to 'sapi/phpdbg/phpdbg_wait.c')
-rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index 593b795b66..db493ccf30 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -46,14 +46,10 @@ typedef struct { HashPosition pos[2]; } phpdbg_intersect_ptr; -static int phpdbg_array_data_compare(const void *a, const void *b) { - Bucket *f, *s; +static int phpdbg_array_data_compare(Bucket *f, Bucket *s) { int result; zval *first, *second; - f = *((Bucket **) a); - s = *((Bucket **) b); - first = &f->val; second = &s->val; @@ -72,8 +68,8 @@ static void phpdbg_array_intersect_init(phpdbg_intersect_ptr *info, HashTable *h info->ht[0] = ht1; info->ht[1] = ht2; - zend_hash_sort(info->ht[0], (compare_func_t) phpdbg_array_data_compare, 0); - zend_hash_sort(info->ht[1], (compare_func_t) phpdbg_array_data_compare, 0); + zend_hash_sort(info->ht[0], phpdbg_array_data_compare, 0); + zend_hash_sort(info->ht[1], phpdbg_array_data_compare, 0); zend_hash_internal_pointer_reset_ex(info->ht[0], &info->pos[0]); zend_hash_internal_pointer_reset_ex(info->ht[1], &info->pos[1]); |