cvs: php-src /main output.c php_output.h

From: Date: Mon, 12 Jun 2006 18:18:39 +0000
Subject: cvs: php-src /main output.c php_output.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-38692@lists.php.net to get a copy of this message
mike Mon Jun 12 18:18:39 2006 UTC Modified files: /php-src/main output.c php_output.h Log: - don't use anonymous union http://cvs.php.net/viewcvs.cgi/php-src/main/output.c?r1=1.182&r2=1.183&diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.182 php-src/main/output.c:1.183 --- php-src/main/output.c:1.182 Tue Jun 6 22:13:23 2006 +++ php-src/main/output.c Mon Jun 12 18:18:39 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.182 2006/06/06 22:13:23 mike Exp $ */ +/* $Id: output.c,v 1.183 2006/06/12 18:18:39 mike Exp $ */ #ifndef PHP_OUTPUT_DEBUG # define PHP_OUTPUT_DEBUG 0 @@ -486,7 +486,7 @@ if (zend_is_callable(output_handler, 0, handler_name)) { handler = php_output_handler_init(handler_name, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_USER); ZVAL_ADDREF(output_handler); - handler->user = output_handler; + handler->func.user = output_handler; } zval_ptr_dtor(&handler_name); return handler; @@ -503,7 +503,7 @@ php_output_handler *handler; handler = php_output_handler_init(name, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_INTERNAL); - handler->internal = output_handler; + handler->func.internal = output_handler; return handler; } @@ -679,7 +679,7 @@ zval_ptr_dtor(&handler->name); STR_FREE(handler->buffer.data); if (handler->flags & PHP_OUTPUT_HANDLER_USER) { - zval_ptr_dtor(&handler->user); + zval_ptr_dtor(&handler->func.user); } if (handler->dtor && handler->opaq) { handler->dtor(handler->opaq TSRMLS_CC); @@ -913,7 +913,7 @@ params[0] = &input; params[1] = &flags; - if ( (SUCCESS == call_user_function_ex(CG(function_table), NULL, handler->user, &retval, 2, params, 1, NULL TSRMLS_CC)) && + if ( (SUCCESS == call_user_function_ex(CG(function_table), NULL, handler->func.user, &retval, 2, params, 1, NULL TSRMLS_CC)) && retval && (Z_TYPE_P(retval) != IS_NULL) && (Z_TYPE_P(retval) != IS_BOOL || Z_BVAL_P(retval))) { /* user handler may have returned TRUE */ status = PHP_OUTPUT_HANDLER_NO_DATA; @@ -941,7 +941,7 @@ context->in.used = handler->buffer.used; context->in.free = 0; - if (SUCCESS == handler->internal(&handler->opaq, context)) { + if (SUCCESS == handler->func.internal(&handler->opaq, context)) { if (context->out.used) { status = PHP_OUTPUT_HANDLER_SUCCESS; } else { http://cvs.php.net/viewcvs.cgi/php-src/main/php_output.h?r1=1.58&r2=1.59&diff_format=u Index: php-src/main/php_output.h diff -u php-src/main/php_output.h:1.58 php-src/main/php_output.h:1.59 --- php-src/main/php_output.h:1.58 Sat Jun 3 11:51:35 2006 +++ php-src/main/php_output.h Mon Jun 12 18:18:39 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_output.h,v 1.58 2006/06/03 11:51:35 mike Exp $ */ +/* $Id: php_output.h,v 1.59 2006/06/12 18:18:39 mike Exp $ */ #ifndef PHP_OUTPUT_H #define PHP_OUTPUT_H @@ -110,7 +110,7 @@ union { zval *user; php_output_handler_context_func_t internal; - }; + } func; } php_output_handler; ZEND_BEGIN_MODULE_GLOBALS(output)

« previous php.cvs (#38692) next »