cvs: php4 /ext/standard array.c

venaas Sat Oct 21 11:12:30 2000 EDT Modified files: /php4/ext/standard array.c Log: Made array_unique use array_type_data_compare instead of array_data_compare Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.76 php4/ext/standard/array.c:1.77 --- php4/ext/standard/array.c:1.76 Sat Oct 21 10:48:11 2000 +++ php4/ext/standard/array.c Sat Oct 21 11:12:30 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.76 2000/10/21 17:48:11 venaas Exp $ */ +/* $Id: array.c,v 1.77 2000/10/21 18:12:30 venaas Exp $ */ #include "php.h" #include "php_ini.h" @@ -2246,12 +2246,12 @@ arTmp[i] = p; arTmp[i] = NULL; set_compare_func(SORT_REGULAR); - qsort((void *) arTmp, i, sizeof(Bucket *), array_data_compare); + qsort((void *) arTmp, i, sizeof(Bucket *), array_type_data_compare); /* go through the sorted array and delete duplicates from the copy */ lastkept = arTmp; for (cmpdata = arTmp + 1; *cmpdata; cmpdata++) { - if (array_data_compare(lastkept, cmpdata)) { + if (array_type_data_compare(lastkept, cmpdata)) { lastkept = cmpdata; } else { p = *cmpdata;