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

derick Thu Nov 15 02:28:36 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/standard array.c basic_functions.c php_array.h Log: - MFH name change #- This is to minimize BBC Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.123.2.3 php4/ext/standard/array.c:1.123.2.4 --- php4/ext/standard/array.c:1.123.2.3 Tue Aug 28 17:52:38 2001 +++ php4/ext/standard/array.c Thu Nov 15 02:28:35 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.123.2.3 2001/08/28 21:52:38 rasmus Exp $ */ +/* $Id: array.c,v 1.123.2.4 2001/11/15 07:28:35 derick Exp $ */ #include "php.h" #include "php_ini.h" @@ -3133,9 +3133,9 @@ /* }}} */ -/* {{{ proto bool key_exists(mixed key, array search) +/* {{{ proto bool array_key_exists(mixed key, array search) Checks if the given key or index exists in the array */ -PHP_FUNCTION(key_exists) +PHP_FUNCTION(array_key_exists) { zval **key, /* key to check for */ **array; /* array to check in */ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.385.2.6 php4/ext/standard/basic_functions.c:1.385.2.7 --- php4/ext/standard/basic_functions.c:1.385.2.6 Sun Nov 11 07:44:00 2001 +++ php4/ext/standard/basic_functions.c Thu Nov 15 02:28:35 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.385.2.6 2001/11/11 12:44:00 stas Exp $ */ +/* $Id: basic_functions.c,v 1.385.2.7 2001/11/15 07:28:35 derick Exp $ */ #include "php.h" #include "php_main.h" @@ -616,7 +616,7 @@ PHP_FE(array_sum, NULL) PHP_FE(array_filter, NULL) PHP_FE(array_map, NULL) - PHP_FE(key_exists, NULL) + PHP_FE(array_key_exists, NULL) /* aliases from array.c */ PHP_FALIAS(pos, current, first_arg_force_ref) Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.27 php4/ext/standard/php_array.h:1.27.2.1 --- php4/ext/standard/php_array.h:1.27 Mon Jul 30 00:58:05 2001 +++ php4/ext/standard/php_array.h Thu Nov 15 02:28:35 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.27 2001/07/30 04:58:05 zeev Exp $ */ +/* $Id: php_array.h,v 1.27.2.1 2001/11/15 07:28:35 derick Exp $ */ #ifndef PHP_ARRAY_H #define PHP_ARRAY_H @@ -77,7 +77,7 @@ PHP_FUNCTION(array_sum); PHP_FUNCTION(array_filter); PHP_FUNCTION(array_map); -PHP_FUNCTION(key_exists); +PHP_FUNCTION(array_key_exists); HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive);