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

Remove the last couple of bogus inlines

Browse source
This commit is contained in:
Zeev Suraski 2001-07-11 17:18:22 +00:00
parent 66c8b08efa
commit 87e3924379
3 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Zend/zend_API.c
View file

@ -577,14 +577,11 @@ ZEND_API int zend_parse_parameters(int num_args, char *type_spec, ...)
/* Argument parsing API -- andrei */ /* Argument parsing API -- andrei */
ZEND_API inline int _array_init(zval *arg ZEND_FILE_LINE_DC) ZEND_API int _array_init(zval *arg ZEND_FILE_LINE_DC)
{ {
ALLOC_HASHTABLE_REL(arg->value.ht); ALLOC_HASHTABLE_REL(arg->value.ht);
if (!arg->value.ht || zend_hash_init(arg->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0)) { zend_hash_init(arg->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_error(E_ERROR, "Cannot allocate memory for array");
return FAILURE;
}
arg->type = IS_ARRAY; arg->type = IS_ARRAY;
return SUCCESS; return SUCCESS;
} }

15
Zend/zend_ptr_stack.c
View file

@ -32,16 +32,6 @@ ZEND_API void zend_ptr_stack_init(zend_ptr_stack *stack)
} }
ZEND_API inline void zend_ptr_stack_push(zend_ptr_stack *stack, void *ptr)
{
if (stack->top >= stack->max) { /* we need to allocate more memory */
stack->elements = (void **) erealloc(stack->elements, (sizeof(void *) * (stack->max *= 2 )));
stack->top_element = stack->elements+stack->top;
}
stack->top++;
*(stack->top_element++) = ptr;
}
ZEND_API void zend_ptr_stack_n_push(zend_ptr_stack *stack, int count, ...) ZEND_API void zend_ptr_stack_n_push(zend_ptr_stack *stack, int count, ...)
{ {
va_list ptr; va_list ptr;
@ -79,11 +69,6 @@ ZEND_API void zend_ptr_stack_n_pop(zend_ptr_stack *stack, int count, ...)
va_end(ptr); va_end(ptr);
} }
ZEND_API inline void *zend_ptr_stack_pop(zend_ptr_stack *stack)
{
stack->top--;
return *(--stack->top_element);
}
ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack) ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack)

19
Zend/zend_ptr_stack.h
View file

@ -31,13 +31,28 @@ typedef struct _zend_ptr_stack {
#define PTR_STACK_BLOCK_SIZE 64 #define PTR_STACK_BLOCK_SIZE 64
ZEND_API void zend_ptr_stack_init(zend_ptr_stack *stack); ZEND_API void zend_ptr_stack_init(zend_ptr_stack *stack);
ZEND_API void zend_ptr_stack_push(zend_ptr_stack *stack, void *ptr);
ZEND_API void zend_ptr_stack_n_push(zend_ptr_stack *stack, int count, ...); ZEND_API void zend_ptr_stack_n_push(zend_ptr_stack *stack, int count, ...);
ZEND_API void *zend_ptr_stack_pop(zend_ptr_stack *stack);
ZEND_API void zend_ptr_stack_n_pop(zend_ptr_stack *stack, int count, ...); ZEND_API void zend_ptr_stack_n_pop(zend_ptr_stack *stack, int count, ...);
ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack); ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack);
ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *)); ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *));
ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements); ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements);
ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack); ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack);
static inline void zend_ptr_stack_push(zend_ptr_stack *stack, void *ptr)
{
if (stack->top >= stack->max) { /* we need to allocate more memory */
stack->elements = (void **) erealloc(stack->elements, (sizeof(void *) * (stack->max *= 2 )));
stack->top_element = stack->elements+stack->top;
}
stack->top++;
*(stack->top_element++) = ptr;
}
static inline void *zend_ptr_stack_pop(zend_ptr_stack *stack)
{
stack->top--;
return *(--stack->top_element);
}
#endif /* ZEND_PTR_STACK_H */ #endif /* ZEND_PTR_STACK_H */