svn: /pecl/yaf/trunk/ yaf_dispatcher.c yaf_dispatcher.h
| From: | Xinchen Hui | Date: | Mon, 27 Jun 2011 10:59:15 +0000 |
| Subject: | svn: /pecl/yaf/trunk/ yaf_dispatcher.c yaf_dispatcher.h | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-15902@lists.php.net to get a copy of this message | ||
laruence Mon, 27 Jun 2011 10:59:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312516
Log:
Made compatible with C89.
Changed paths:
U pecl/yaf/trunk/yaf_dispatcher.c
U pecl/yaf/trunk/yaf_dispatcher.h
Modified: pecl/yaf/trunk/yaf_dispatcher.c
===================================================================
--- pecl/yaf/trunk/yaf_dispatcher.c 2011-06-27 10:56:55 UTC (rev 312515)
+++ pecl/yaf/trunk/yaf_dispatcher.c 2011-06-27 10:59:15 UTC (rev 312516)
@@ -10,7 +10,7 @@
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
- | Author: Laruence<laruence@yahoo.com.cn> |
+ | Author: Xinchen Hui <laruence@php.net> |
+----------------------------------------------------------------------+
$Id$
*/
@@ -490,13 +490,16 @@
executor = icontroller;
- if (fptr->common.num_args) {
+ if (fptr->common.num_args) {
+ zval *method_name = NULL;
+
yaf_dispatcher_get_call_parmaters(request, fptr, &call_args, &count TSRMLS_CC);
- zval *method_name = NULL;
MAKE_STD_ZVAL(method_name);
ZVAL_STRINGL(method_name, func_name, func_name_len, FALSE);
+
call_user_function_ex(&(ce)->function_table, &icontroller,
method_name, &ret, count, call_args, TRUE, NULL TSRMLS_CC);
+
efree(method_name);
efree(call_args);
} else {
@@ -537,12 +540,15 @@
yaf_update_property(iaction, YAF_CONTROLLER_PROPERTY_NAME_NAME, controller);
if (fptr->common.num_args) {
+ zval *method_name = NULL;
+
yaf_dispatcher_get_call_parmaters(request, fptr, &call_args, &count TSRMLS_CC);
- zval *method_name = NULL;
MAKE_STD_ZVAL(method_name);
ZVAL_STRINGL(method_name, YAF_ACTION_EXECUTOR_NAME, sizeof(YAF_ACTION_EXECUTOR_NAME) - 1,
FALSE);
+
call_user_function_ex(&(ce)->function_table, &iaction, method_name,
&ret, count, call_args, TRUE, NULL TSRMLS_CC);
+
efree(method_name);
efree(call_args);
} else {
Modified: pecl/yaf/trunk/yaf_dispatcher.h
===================================================================
--- pecl/yaf/trunk/yaf_dispatcher.h 2011-06-27 10:56:55 UTC (rev 312515)
+++ pecl/yaf/trunk/yaf_dispatcher.h 2011-06-27 10:59:15 UTC (rev 312516)
@@ -10,7 +10,7 @@
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
- | Author: Laruence<laruence@yahoo.com.cn> |
+ | Author: Xinchen Hui <laruence@php.net> |
+----------------------------------------------------------------------+
$Id$
*/