com php-src: use correct param types: dev/phpdbg_parser.y phpdbg_parser.c phpdbg_prompt.c

Commit: cadc909bb73eaf13108e55e7f7b5d64df812cf4e Author: krakjoe <joe.watkins@live.co.uk> Tue, 18 Feb 2014 08:39:38 +0000 Parents: d9801018035ac61fd0d923fc4c24eb98cc41d0e8 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cadc909bb73eaf13108e55e7f7b5d64df812cf4e Log: use correct param types Changed paths: M dev/phpdbg_parser.y M phpdbg_parser.c M phpdbg_prompt.c Diff: diff --git a/dev/phpdbg_parser.y b/dev/phpdbg_parser.y index 9d7149f..24bcc68 100644 --- a/dev/phpdbg_parser.y +++ b/dev/phpdbg_parser.y @@ -191,11 +191,11 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) { switch (command->type) { case EVAL_PARAM: - phpdbg_notice("eval (%s)", command->str); + PHPDBG_COMMAND_HANDLER(eval)(command, NULL TSRMLS_CC); break; case SHELL_PARAM: - phpdbg_notice("shell (%s)", command->str); + PHPDBG_COMMAND_HANDLER(shell)(command, NULL TSRMLS_CC); break; case STR_PARAM: { @@ -228,7 +228,6 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) { return SUCCESS; } - %} %code requires { diff --git a/phpdbg_parser.c b/phpdbg_parser.c index ef9d4f4..79745ce 100644 --- a/phpdbg_parser.c +++ b/phpdbg_parser.c @@ -259,11 +259,11 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) { switch (command->type) { case EVAL_PARAM: - phpdbg_notice("eval (%s)", command->str); + PHPDBG_COMMAND_HANDLER(eval)(command, NULL TSRMLS_CC); break; case SHELL_PARAM: - phpdbg_notice("shell (%s)", command->str); + PHPDBG_COMMAND_HANDLER(shell)(command, NULL TSRMLS_CC); break; case STR_PARAM: { diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index e53a5e6..632ceb9 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt..c @@ -617,7 +617,7 @@ out: PHPDBG_COMMAND(eval) /* {{{ */ { switch (param->type) { - case STR_PARAM: { + case EVAL_PARAM: { zend_bool stepping = ((PHPDBG_G(flags) & PHPDBG_IS_STEPPING)==PHPDBG_IS_STEPPING); zval retval; @@ -780,7 +780,7 @@ PHPDBG_COMMAND(shell) /* {{{ */ { /* don't allow this to loop, ever ... */ switch (param->type) { - case STR_PARAM: { + case SHELL_PARAM: { FILE *fd = NULL; if ((fd=VCWD_POPEN((char*)param->str, "w"))) { /* do something perhaps ?? do we want input ?? */