From: Felipe Pena Date: Sun, 24 Nov 2013 12:02:23 +0000 (-0200) Subject: - Fixed format string according to data type X-Git-Tag: php-5.6.0alpha1~110^2~105 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94cc2587150e6a75bd08bb48005ed4d6c393f59c;p=php - Fixed format string according to data type --- diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index a2130653bf..60b48a15f9 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -457,7 +457,7 @@ PHPDBG_COMMAND(frame) /* {{{ */ break; case EMPTY_PARAM: - phpdbg_notice("Currently at frame %d:", PHPDBG_G(frame).num); + phpdbg_notice("Currently at frame %ld:", PHPDBG_G(frame).num); break; phpdbg_default_switch_case(); @@ -509,7 +509,7 @@ static inline void phpdbg_handle_exception(TSRMLS_D) /* }}} */ /* output useful information about address */ phpdbg_writeln( - "Stacked entered at %p in %s on line %lu", + "Stacked entered at %p in %s on line %u", EG(active_op_array)->opcodes, filename, lineno); zval_dtor(&fname); @@ -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:%ld", i, Z_STRVAL_PP(file), Z_LVAL_PP(line)); break; } @@ -684,7 +684,7 @@ PHPDBG_COMMAND(back) /* {{{ */ } } - phpdbg_writeln(") at %s:%d", Z_STRVAL_PP(file), Z_LVAL_PP(line)); + phpdbg_writeln(") at %s:%ld", Z_STRVAL_PP(file), Z_LVAL_PP(line)); } phpdbg_writeln(EMPTY);