diff options
Diffstat (limited to 'main/output.c')
-rw-r--r-- | main/output.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/main/output.c b/main/output.c index d155123834..ec844973c5 100644 --- a/main/output.c +++ b/main/output.c @@ -103,20 +103,20 @@ static size_t (*php_output_direct)(const char *str, size_t str_len) = php_output static void php_output_header(void) { if (!SG(headers_sent)) { - if (!OG(output_start_filename_str)) { + if (!OG(output_start_filename)) { if (zend_is_compiling()) { - OG(output_start_filename_str) = zend_get_compiled_filename(); + OG(output_start_filename) = zend_get_compiled_filename(); OG(output_start_lineno) = zend_get_compiled_lineno(); } else if (zend_is_executing()) { - OG(output_start_filename_str) = zend_get_executed_filename_ex(); + OG(output_start_filename) = zend_get_executed_filename_ex(); OG(output_start_lineno) = zend_get_executed_lineno(); } - if (OG(output_start_filename_str)) { - zend_string_addref(OG(output_start_filename_str)); + if (OG(output_start_filename)) { + zend_string_addref(OG(output_start_filename)); } #if PHP_OUTPUT_DEBUG fprintf(stderr, "!!! output started at: %s (%d)\n", - ZSTR_VAL(OG(output_start_filename_str)), OG(output_start_lineno)); + ZSTR_VAL(OG(output_start_filename)), OG(output_start_lineno)); #endif } if (!php_header()) { @@ -195,9 +195,9 @@ PHPAPI void php_output_deactivate(void) zend_stack_destroy(&OG(handlers)); } - if (OG(output_start_filename_str)) { - zend_string_release(OG(output_start_filename_str)); - OG(output_start_filename_str) = NULL; + if (OG(output_start_filename)) { + zend_string_release(OG(output_start_filename)); + OG(output_start_filename) = NULL; } } /* }}} */ @@ -758,7 +758,7 @@ PHPAPI void php_output_set_implicit_flush(int flush) * Get the file name where output has started */ PHPAPI const char *php_output_get_start_filename(void) { - return OG(output_start_filename_str) ? ZSTR_VAL(OG(output_start_filename_str)) : NULL; + return OG(output_start_filename) ? ZSTR_VAL(OG(output_start_filename)) : NULL; } /* }}} */ @@ -807,7 +807,7 @@ static inline void php_output_context_reset(php_output_context *context) /* {{{ static void php_output_context_feed(php_output_context *context, char *, size_t, size_t) * Feed output contexts input buffer */ -static inline void php_output_context_feed(php_output_context *context, char *data, size_t size, size_t used, zend_bool free) +static inline void php_output_context_feed(php_output_context *context, char *data, size_t size, size_t used, bool free) { if (context->in.free && context->in.data) { efree(context->in.data); @@ -970,7 +970,7 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl /* user handler may have returned TRUE */ status = PHP_OUTPUT_HANDLER_NO_DATA; if (Z_TYPE(retval) != IS_FALSE && Z_TYPE(retval) != IS_TRUE) { - convert_to_string_ex(&retval); + convert_to_string(&retval); if (Z_STRLEN(retval)) { context->out.data = estrndup(Z_STRVAL(retval), Z_STRLEN(retval)); context->out.used = Z_STRLEN(retval); @@ -1491,7 +1491,7 @@ PHP_FUNCTION(ob_list_handlers) /* {{{ Return the status of the active or all output buffers */ PHP_FUNCTION(ob_get_status) { - zend_bool full_status = 0; + bool full_status = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &full_status) == FAILURE) { RETURN_THROWS(); |