cvs: php4 /ext/standard/ array.c basic_functions.c php_array.h

venaas Sat Jun 10 12:09:56 2000 EDT Modified files: /php4/ext/standard php_array.h basic_functions.c array.c Log: Changed array_subtract to array_diff Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.12 php4/ext/standard/php_array.h:1.13 --- php4/ext/standard/php_array.h:1.12 Sat Jun 10 11:58:45 2000 +++ php4/ext/standard/php_array.h Sat Jun 10 12:09:56 2000 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.12 2000/06/10 18:58:45 venaas Exp $ */ +/* $Id: php_array.h,v 1.13 2000/06/10 19:09:56 venaas Exp $ */ #ifndef _PHP_ARRAY_H #define _PHP_ARRAY_H @@ -71,7 +71,7 @@ PHP_FUNCTION(array_rand); PHP_FUNCTION(array_unique); PHP_FUNCTION(array_intersect); -PHP_FUNCTION(array_subtract); +PHP_FUNCTION(array_diff); HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); int multisort_compare(const void *a, const void *b); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.211 php4/ext/standard/basic_functions.c:1.212 --- php4/ext/standard/basic_functions.c:1.211 Sat Jun 10 11:58:45 2000 +++ php4/ext/standard/basic_functions.c Sat Jun 10 12:09:56 2000 @@ -509,7 +509,7 @@ PHP_FE(array_rand, NULL) PHP_FE(array_unique, NULL) PHP_FE(array_intersect, NULL) - PHP_FE(array_subtract, NULL) + PHP_FE(array_diff, NULL) /* aliases from array.c */ PHP_FALIAS(pos, current, first_arg_force_ref) Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.52 php4/ext/standard/array.c:1.53 --- php4/ext/standard/array.c:1.52 Sat Jun 10 11:58:45 2000 +++ php4/ext/standard/array.c Sat Jun 10 12:09:56 2000 @@ -2291,10 +2291,10 @@ } /* }}} */ -/* {{{ proto array array_subtract(array arr1, array arr2 [, ...]) +/* {{{ proto array array_diff(array arr1, array arr2 [, ...]) Returns the entries of arr1 that have values which are not present in any of the others arguments */ -PHP_FUNCTION(array_subtract) +PHP_FUNCTION(array_diff) { zval ***args = NULL; HashTable *hash;