cvs: php4 /ext/standard array.c

jeroen Sun Oct 7 09:49:08 2001 EDT Modified files: /php4/ext/standard array.c Log: Fix naming inside php_search_array, comp_func is not a compare function. Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.140 php4/ext/standard/array.c:1.141 --- php4/ext/standard/array.c:1.140 Fri Oct 5 17:58:41 2001 +++ php4/ext/standard/array.c Sun Oct 7 09:49:08 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.140 2001/10/05 21:58:41 jeroen Exp $ */ +/* $Id: array.c,v 1.141 2001/10/07 13:49:08 jeroen Exp $ */ #include "php.h" #include "php_ini.h" @@ -1044,7 +1044,7 @@ 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 @@ 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;