diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-12-26 18:29:04 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-12-26 18:29:04 +0300 |
| commit | df850bf2d2c16798e9877aaf36780493fbf47c82 (patch) | |
| tree | 2efeb011000956b84c6e5f7ed41bd358e3d03c45 | |
| parent | 9882929bfa4422765c1b1fde6a612fa48bfcce2e (diff) | |
| download | php-git-df850bf2d2c16798e9877aaf36780493fbf47c82.tar.gz | |
Reduce agressive inlining
| -rw-r--r-- | main/output.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/main/output.c b/main/output.c index 9622167926..e56757c6b2 100644 --- a/main/output.c +++ b/main/output.c @@ -58,12 +58,12 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl static inline int php_output_handler_append(php_output_handler *handler, const php_output_buffer *buf); static inline zval *php_output_handler_status(php_output_handler *handler, zval *entry); -static inline php_output_context *php_output_context_init(php_output_context *context, int op); +static inline void php_output_context_init(php_output_context *context, int op); static inline void php_output_context_reset(php_output_context *context); static inline void php_output_context_swap(php_output_context *context); static inline void php_output_context_dtor(php_output_context *context); -static inline int php_output_stack_pop(int flags); +static int php_output_stack_pop(int flags); static int php_output_stack_apply_op(void *h, void *c); static int php_output_stack_apply_clean(void *h, void *c); @@ -781,16 +781,10 @@ static inline int php_output_lock_error(int op) /* {{{ static php_output_context *php_output_context_init(php_output_context *context, int op) * Initialize a new output context */ -static inline php_output_context *php_output_context_init(php_output_context *context, int op) +static inline void php_output_context_init(php_output_context *context, int op) { - if (!context) { - context = emalloc(sizeof(php_output_context)); - } - memset(context, 0, sizeof(php_output_context)); context->op = op; - - return context; } /* }}} */ @@ -1199,7 +1193,7 @@ static inline zval *php_output_handler_status(php_output_handler *handler, zval /* {{{ static int php_output_stack_pop(int flags) * Pops an output handler off the stack */ -static inline int php_output_stack_pop(int flags) +static int php_output_stack_pop(int flags) { php_output_context context; php_output_handler **current, *orphan = OG(active); |