some more after merge fixes

weltling · weltling · commit 047a39c94670 · 2014-04-26T00:42:22.000+02:00
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c
@@ -186,7 +186,7 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */
 
 		if (zend_hash_get_current_data_ex(Z_ARRVAL(zbacktrace),
 			(void**)&tmp, &position) == FAILURE) {
-			phpdbg_write("frame #%d: {main} at %s:%pd", i, Z_STRVAL_PP(file), Z_LVAL_PP(line));
+			phpdbg_write("frame #%d: {main} at %s:%pd", i, Z_STRVAL_PP(file), Z_IVAL_PP(line));
 			break;
 		}
 
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
@@ -120,7 +120,7 @@ static inline int phpdbg_call_register(phpdbg_param_t *stack TSRMLS_DC) /* {{{ *
 						break;
 						
 						case NUMERIC_PARAM:
-							add_next_index_long(&params, next->num);
+							add_next_index_int(&params, next->num);
 						break;
 						
 						case METHOD_PARAM:

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */`
`186`	`186`
`187`	`187`	`if (zend_hash_get_current_data_ex(Z_ARRVAL(zbacktrace),`
`188`	`188`	`(void**)&tmp, &position) == FAILURE) {`
`189`		`- phpdbg_write("frame #%d: {main} at %s:%pd", i, Z_STRVAL_PP(file), Z_LVAL_PP(line));`
	`189`	`+ phpdbg_write("frame #%d: {main} at %s:%pd", i, Z_STRVAL_PP(file), Z_IVAL_PP(line));`
`190`	`190`	`break;`
`191`	`191`	`}`
`192`	`192`