diff options
| author | Jeroen van Wolffelaar <jeroen@php.net> | 2001-10-07 13:49:08 +0000 |
|---|---|---|
| committer | Jeroen van Wolffelaar <jeroen@php.net> | 2001-10-07 13:49:08 +0000 |
| commit | 78b881f389224031b882734a4c9654e00931fe84 (patch) | |
| tree | a985332e5ca3431a4a65d3da81e6d5030862cdd6 /ext/standard/array.c | |
| parent | f04497bab2cfb26d290dd15aa15e52ae32a0c58b (diff) | |
| download | php-git-78b881f389224031b882734a4c9654e00931fe84.tar.gz | |
Fix naming inside php_search_array, comp_func is not a compare function.
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index a6cea5e699..0630a39ab0 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1044,7 +1044,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) ulong num_key; uint str_key_len; char *string_key; - int (*compare_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function; + int (*is_equal_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function; if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &array, &strict) == FAILURE) { @@ -1064,14 +1064,14 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) if (ZEND_NUM_ARGS() == 3) { convert_to_boolean_ex(strict); if (Z_LVAL_PP(strict)) { - compare_func = is_identical_function; + is_equal_func = is_identical_function; } } target_hash = HASH_OF(*array); zend_hash_internal_pointer_reset_ex(target_hash, &pos); while(zend_hash_get_current_data_ex(target_hash, (void **)&entry, &pos) == SUCCESS) { - compare_func(&res, *value, *entry TSRMLS_CC); + is_equal_func(&res, *value, *entry TSRMLS_CC); if (Z_LVAL(res)) { if (behavior==0) { RETURN_TRUE; |