archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added array_merge() function.

Browse source
This commit is contained in:
Andrey Hristov 1999-06-05 21:19:25 +00:00
parent 2db1d61718
commit f8f8defb42
2 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

58
ext/standard/basic_functions.c
View file

@ -303,6 +303,7 @@ function_entry basic_functions[] = {
PHP_FE(unshift, first_arg_force_ref)
PHP_FE(splice, first_arg_force_ref)
PHP_FE(slice, NULL)
PHP_FE(array_merge, NULL)
{NULL, NULL, NULL}
};
@ -2827,6 +2828,63 @@ PHP_FUNCTION(slice)
/* }}} */
/* {{{ proto array array_merge(array arr1 [, array arr2, ...])
Merges elements from passed arrays into one array */
PHP_FUNCTION(array_merge)
{
zval **args = NULL,
**entry;
HashTable *hash;
int argc,
i;
char *string_key;
ulong num_key;
/* Get the argument count and check it */
argc = ARG_COUNT(ht);
if (argc < 2) {
WRONG_PARAM_COUNT;
}
/* Allocate arguments array and get the arguments, checking for errors. */
args = (zval **)emalloc(argc * sizeof(zval *));
if (getParametersArray(ht, argc, args) == FAILURE) {
efree(args);
WRONG_PARAM_COUNT;
}
array_init(return_value);
for (i=0; i<argc; i++) {
convert_to_array(args[i]);
hash = args[i]->value.ht;
zend_hash_internal_pointer_reset(hash);
while(zend_hash_get_current_data(hash, (void **)&entry) == SUCCESS) {
(*entry)->refcount++;
switch (zend_hash_get_current_key(hash, &string_key, &num_key)) {
case HASH_KEY_IS_STRING:
zend_hash_update(return_value->value.ht, string_key, strlen(string_key)+1,
entry, sizeof(zval *), NULL);
efree(string_key);
break;
case HASH_KEY_IS_LONG:
zend_hash_next_index_insert(return_value->value.ht,
entry, sizeof(zval *), NULL);
break;
}
zend_hash_move_forward(hash);
}
}
efree(args);
}
/* }}} */
/*
* Local variables:
* tab-width: 4

1
ext/standard/basic_functions.h
View file

@ -128,6 +128,7 @@ PHP_FUNCTION(shift);
PHP_FUNCTION(unshift);
PHP_FUNCTION(splice);
PHP_FUNCTION(slice);
PHP_FUNCTION(array_merge);
#if HAVE_PUTENV
typedef struct {