archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make array_shift/array_pop work better.

Browse source
This commit is contained in:
Andrey Hristov 1999-06-09 22:03:15 +00:00
parent 2fb5e56123
commit f7072fbf87
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/standard/basic_functions.c
View file

@ -2571,6 +2571,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
{ {
zval *stack, /* Input stack */ zval *stack, /* Input stack */
**val; /* Value to be popped */ **val; /* Value to be popped */
HashTable *new_hash; /* New stack */
char *string_key; char *string_key;
ulong num_key; ulong num_key;
@ -2600,16 +2601,10 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
return_value->is_ref=0; return_value->is_ref=0;
/* Delete the first or last value */ /* Delete the first or last value */
switch (zend_hash_get_current_key(stack->value.ht, &string_key, &num_key)) { new_hash = _phpi_splice(stack->value.ht, (off_the_end) ? -1 : 0, 1, NULL, 0, NULL);
case HASH_KEY_IS_STRING: zend_hash_destroy(stack->value.ht);
zend_hash_del(stack->value.ht, string_key, strlen(string_key)+1); efree(stack->value.ht);
efree(string_key); stack->value.ht = new_hash;
break;
case HASH_KEY_IS_LONG:
zend_hash_index_del(stack->value.ht, num_key);
break;
}
} }
/* }}} */ /* }}} */