1
0
mirror of https://github.com/php/php-src.git synced 2026-03-31 12:42:29 +02:00

Merge branch 'master' of github.com:krakjoe/phpdbg

This commit is contained in:
Felipe Pena
2013-11-14 10:40:15 -02:00
2 changed files with 7 additions and 7 deletions

View File

@@ -178,7 +178,7 @@ PHPDBG_PRINT(func) /* {{{ */
func_table = &EG(scope)->function_table;
} else {
phpdbg_error("No active class");
return FAILURE;
return SUCCESS;
}
} else if (!EG(function_table)) {
phpdbg_error("No function table loaded");

View File

@@ -26,8 +26,8 @@
/**
* Command Declarators
*/
#define PHPDBG_PRINT_D(name, tip) \
{PHPDBG_STRL(#name), tip, sizeof(tip)-1, 0, phpdbg_do_print_##name}
#define PHPDBG_PRINT_D(name, tip, alias) \
{PHPDBG_STRL(#name), tip, sizeof(tip)-1, alias, phpdbg_do_print_##name}
#define PHPDBG_PRINT(name) \
int phpdbg_do_print_##name(const char *expr, size_t expr_len TSRMLS_DC)
@@ -43,10 +43,10 @@ PHPDBG_PRINT(func);
* Commands
*/
static const phpdbg_command_t phpdbg_print_commands[] = {
PHPDBG_PRINT_D(opline, "print the current opline information"),
PHPDBG_PRINT_D(class, "print out the instructions in the specified class"),
PHPDBG_PRINT_D(method, "print out the instructions in the specified method"),
PHPDBG_PRINT_D(func, "print out the instructions in the specified function"),
PHPDBG_PRINT_D(opline, "print the current opline information", 'o'),
PHPDBG_PRINT_D(class, "print out the instructions in the specified class", 'c'),
PHPDBG_PRINT_D(method, "print out the instructions in the specified method", 'm'),
PHPDBG_PRINT_D(func, "print out the instructions in the specified function", 'f'),
{0, 0, 0, 0}
};