diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-04-03 19:56:15 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-04-03 19:56:15 +0100 |
| commit | 6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (patch) | |
| tree | 3612c90af5d656357045e107ccac556863e929a3 /sapi/phpdbg/phpdbg_print.c | |
| parent | df85331220ac60391d5f8d82c42a6c699f47fca1 (diff) | |
| parent | 80015ba741fc857074050086db6c7b2a4716d6d5 (diff) | |
| download | php-git-6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a.tar.gz | |
Merge branch 'openssl_error_store' of github.com:bukka/php-src into openssl_error_store
Diffstat (limited to 'sapi/phpdbg/phpdbg_print.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_print.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c index 6b6c706f92..00209cb239 100644 --- a/sapi/phpdbg/phpdbg_print.c +++ b/sapi/phpdbg/phpdbg_print.c @@ -42,7 +42,7 @@ const phpdbg_command_t phpdbg_print_commands[] = { PHPDBG_PRINT(opline) /* {{{ */ { if (PHPDBG_G(in_execution) && EG(current_execute_data)) { - phpdbg_print_opline(EG(current_execute_data), 1); + phpdbg_print_opline(phpdbg_user_execute_data(EG(current_execute_data)), 1); } else { phpdbg_error("inactive", "type=\"execution\"", "Not Executing!"); } @@ -124,7 +124,7 @@ return SUCCESS; PHPDBG_PRINT(stack) /* {{{ */ { if (PHPDBG_G(in_execution) && EG(current_execute_data)) { - zend_op_array *ops = &EG(current_execute_data)->func->op_array; + zend_op_array *ops = &phpdbg_user_execute_data(EG(current_execute_data))->func->op_array; if (ops->function_name) { if (ops->scope) { phpdbg_notice("printinfo", "method=\"%s::%s\" num=\"%d\"", "Stack in %s::%s() (%d ops)", ZSTR_VAL(ops->scope->name), ZSTR_VAL(ops->function_name), ops->last); @@ -278,7 +278,7 @@ void phpdbg_print_opcodes_function(const char *function, size_t len) { return; } - phpdbg_out("function name: %.*s\n", ZSTR_LEN(func->op_array.function_name), ZSTR_VAL(func->op_array.function_name)); + phpdbg_out("function name: %.*s\n", (int) ZSTR_LEN(func->op_array.function_name), ZSTR_VAL(func->op_array.function_name)); phpdbg_print_function_helper(func); } @@ -351,7 +351,7 @@ static void phpdbg_print_opcodes_ce(zend_class_entry *ce) { phpdbg_out("\n"); ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->function_table, method_name, method) { - phpdbg_out("\nfunction name: %s\n", method_name); + phpdbg_out("\nfunction name: %s\n", ZSTR_VAL(method_name)); phpdbg_print_function_helper(method); } ZEND_HASH_FOREACH_END(); } |