archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Modified array_walk() function so that the userland callback is passed

Browse source 
a key and possible user data in addition to the value.  It's still backward
compatible with one argument version.
This commit is contained in:
Andrey Hristov 1999-08-07 16:43:25 +00:00
parent 1701a9e22f
commit fd87bb3321
1 changed files with 48 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

57
ext/standard/basic_functions.c
View file

@ -1454,23 +1454,62 @@ PHP_FUNCTION(max)
static pval *php_array_walk_func_name; static pval *php_array_walk_func_name;
static int php_array_walk(HashTable *target_hash, zval **userdata)
static int php_array_walk(pval **a)
{ {
pval retval; zval **args[3], /* Arguments to userland function */
retval, /* Return value - unused */
*key; /* Entry key */
char *string_key;
ulong num_key;
CLS_FETCH(); CLS_FETCH();
call_user_function_ex(CG(function_table), NULL, php_array_walk_func_name, &retval, 1, &a, 0); /* Allocate space for key */
MAKE_STD_ZVAL(key);
/* Set up known arguments */
args[1] = &key;
args[2] = userdata;
/* Iterate through hash */
while(zend_hash_get_current_data(target_hash, (void **)&args[0]) == SUCCESS) {
/* Set up the key */
if (zend_hash_get_current_key(target_hash, &string_key, &num_key) == HASH_KEY_IS_LONG) {
key->type = IS_LONG;
key->value.lval = num_key;
} else {
key->type = IS_STRING;
key->value.str.val = string_key;
key->value.str.len = strlen(string_key);
}
/* Call the userland function */
call_user_function_ex(CG(function_table), NULL, php_array_walk_func_name,
&retval, (*userdata) ? 3 : 2, args, 0);
/* Clean up the key */
if (zend_hash_get_current_key_type(target_hash) == HASH_KEY_IS_STRING)
efree(key->value.str.val);
zend_hash_move_forward(target_hash);
}
efree(key);
return 0; return 0;
} }
PHP_FUNCTION(array_walk) /* {{{ proto array_walk(array input, string funcname [, mixed userdata])
{ Apply a user function to every member of an array */
pval *array, *old_walk_func_name; PHP_FUNCTION(array_walk) {
int argc;
zval *array,
*userdata = NULL,
*old_walk_func_name;
HashTable *target_hash; HashTable *target_hash;
argc = ARG_COUNT(ht);
old_walk_func_name = php_array_walk_func_name; old_walk_func_name = php_array_walk_func_name;
if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &array, &php_array_walk_func_name) == FAILURE) { if (argc < 2 || argc > 3 ||
getParameters(ht, argc, &array, &php_array_walk_func_name, &userdata) == FAILURE) {
php_array_walk_func_name = old_walk_func_name; php_array_walk_func_name = old_walk_func_name;
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
} }
@ -1481,7 +1520,7 @@ PHP_FUNCTION(array_walk)
return; return;
} }
convert_to_string(php_array_walk_func_name); convert_to_string(php_array_walk_func_name);
zend_hash_apply(target_hash, (int (*)(void *))php_array_walk); php_array_walk(target_hash, &userdata);
php_array_walk_func_name = old_walk_func_name; php_array_walk_func_name = old_walk_func_name;
RETURN_TRUE; RETURN_TRUE;
} }