diff options
Diffstat (limited to 'main/output.c')
| -rw-r--r-- | main/output.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/main/output.c b/main/output.c index a0a300b376..5c56fe98cd 100644 --- a/main/output.c +++ b/main/output.c @@ -110,7 +110,7 @@ static void php_output_header(void) if (!SG(headers_sent)) { if (!OG(output_start_filename)) { if (zend_is_compiling()) { - OG(output_start_filename) = zend_get_compiled_filename()->val; + OG(output_start_filename) = ZSTR_VAL(zend_get_compiled_filename()); OG(output_start_lineno) = zend_get_compiled_lineno(); } else if (zend_is_executing()) { OG(output_start_filename) = zend_get_executed_filename(); @@ -550,13 +550,13 @@ PHPAPI int php_output_handler_start(php_output_handler *handler) return FAILURE; } if (NULL != (conflict = zend_hash_find_ptr(&php_output_handler_conflicts, handler->name))) { - if (SUCCESS != conflict(handler->name->val, handler->name->len)) { + if (SUCCESS != conflict(ZSTR_VAL(handler->name), ZSTR_LEN(handler->name))) { return FAILURE; } } if (NULL != (rconflicts = zend_hash_find_ptr(&php_output_handler_reverse_conflicts, handler->name))) { ZEND_HASH_FOREACH_PTR(rconflicts, conflict) { - if (SUCCESS != conflict(handler->name->val, handler->name->len)) { + if (SUCCESS != conflict(ZSTR_VAL(handler->name), ZSTR_LEN(handler->name))) { return FAILURE; } } ZEND_HASH_FOREACH_END(); @@ -579,7 +579,7 @@ PHPAPI int php_output_handler_started(const char *name, size_t name_len) handlers = (php_output_handler **) zend_stack_base(&OG(handlers)); for (i = 0; i < count; ++i) { - if (name_len == handlers[i]->name->len && !memcmp(handlers[i]->name->val, name, name_len)) { + if (name_len == ZSTR_LEN(handlers[i]->name) && !memcmp(ZSTR_VAL(handlers[i]->name), name, name_len)) { return 1; } } @@ -1203,7 +1203,7 @@ static inline int php_output_stack_pop(int flags) return 0; } else if (!(flags & PHP_OUTPUT_POP_FORCE) && !(orphan->flags & PHP_OUTPUT_HANDLER_REMOVABLE)) { if (!(flags & PHP_OUTPUT_POP_SILENT)) { - php_error_docref("ref.outcontrol", E_NOTICE, "failed to %s buffer of %s (%d)", (flags&PHP_OUTPUT_POP_DISCARD)?"discard":"send", orphan->name->val, orphan->level); + php_error_docref("ref.outcontrol", E_NOTICE, "failed to %s buffer of %s (%d)", (flags&PHP_OUTPUT_POP_DISCARD)?"discard":"send", ZSTR_VAL(orphan->name), orphan->level); } return 0; } else { @@ -1330,7 +1330,7 @@ PHP_FUNCTION(ob_flush) } if (SUCCESS != php_output_flush()) { - php_error_docref("ref.outcontrol", E_NOTICE, "failed to flush buffer of %s (%d)", OG(active)->name->val, OG(active)->level); + php_error_docref("ref.outcontrol", E_NOTICE, "failed to flush buffer of %s (%d)", ZSTR_VAL(OG(active)->name), OG(active)->level); RETURN_FALSE; } RETURN_TRUE; @@ -1351,7 +1351,7 @@ PHP_FUNCTION(ob_clean) } if (SUCCESS != php_output_clean()) { - php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer of %s (%d)", OG(active)->name->val, OG(active)->level); + php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer of %s (%d)", ZSTR_VAL(OG(active)->name), OG(active)->level); RETURN_FALSE; } RETURN_TRUE; @@ -1406,7 +1406,7 @@ PHP_FUNCTION(ob_get_flush) } if (SUCCESS != php_output_end()) { - php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer of %s (%d)", OG(active)->name->val, OG(active)->level); + php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer of %s (%d)", ZSTR_VAL(OG(active)->name), OG(active)->level); } } /* }}} */ @@ -1429,7 +1429,7 @@ PHP_FUNCTION(ob_get_clean) } if (SUCCESS != php_output_discard()) { - php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer of %s (%d)", OG(active)->name->val, OG(active)->level); + php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer of %s (%d)", ZSTR_VAL(OG(active)->name), OG(active)->level); } } /* }}} */ |