com php-src: typo set last command/param more carefully: phpdbg_cmd.c phpdbg_prompt.c
| From: | Bob Weinand | Date: | Sun, 24 Nov 2013 07:37:54 +0000 |
| Subject: | com php-src: typo set last command/param more carefully: phpdbg_cmd.c phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74661@lists.php.net to get a copy of this message | ||
Commit: abef3fccc298331efa7242977c779fba17eb29a3
Author: krakjoe <joe.watkins@live.co.uk> Sun, 24 Nov 2013 07:37:54 +0000
Parents: 6e8eeea3bce5bee736e5ad4fdca87d785ac78337
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abef3fccc298331efa7242977c779fba17eb29a3
Log:
typo
set last command/param more carefully
Changed paths:
M phpdbg_cmd.c
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index 45c6a77..580f68a 100644
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -380,14 +380,16 @@ PHPDBG_API int phpdbg_do_cmd(const phpdbg_command_t *command, phpdbg_input_t
*in
}
}
- if (!(PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) {
+ rc = command->handler(¶m, input TSRMLS_CC);
+
+ /* only set last command when it is worth it ! */
+ if ((rc != FAILURE) &&
+ !(PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) {
PHPDBG_G(lcmd) = (phpdbg_command_t*) command;
phpdbg_clear_param(
&PHPDBG_G(lparam) TSRMLS_CC);
PHPDBG_G(lparam) = param;
}
-
- rc = command->handler(¶m, input TSRMLS_CC);
break;
}
command++;
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 552a8bc..8889450 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -651,7 +651,7 @@ PHPDBG_COMMAND(back) /* {{{ */
zend_hash_move_forward_ex(Z_ARRVAL(zbacktrace), &position);
if (zend_hash_get_current_data_ex(Z_ARRVAL(zbacktrace), (void**)&tmp, &position) ==
FAILURE) {
phpdbg_write(
- "frame #%d {main} at %s:%d",
+ "frame #%d: {main} at %s:%d",
i, Z_STRVAL_PP(file), Z_LVAL_PP(line));
break;
}