From d8496fc9be697109ec74fa829cc08823f0f028ef Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 8 Nov 2025 14:30:13 +0900 Subject: [PATCH] mruby-bin-debugger: combine variable declaration with initialization --- .../mruby-bin-debugger/tools/mrdb/cmdprint.c | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c index f78c1e1fc..027e29afa 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c @@ -16,26 +16,21 @@ dbgcmd_state dbgcmd_print(mrb_state *mrb, mrdb_state *mrdb) { - mrb_value expr; - mrb_value result; - uint8_t wcnt; - int ai; - if (mrdb->wcnt <= 1) { puts("Parameter not specified."); return DBGST_PROMPT; } - ai = mrb_gc_arena_save(mrb); + int ai = mrb_gc_arena_save(mrb); /* eval expr */ - expr = mrb_str_new_cstr(mrb, NULL); - for (wcnt=1; wcntwcnt; wcnt++) { + mrb_value expr = mrb_str_new_cstr(mrb, NULL); + for (uint8_t wcnt=1; wcntwcnt; wcnt++) { expr = mrb_str_cat_lit(mrb, expr, " "); expr = mrb_str_cat_cstr(mrb, expr, mrdb->words[wcnt]); } - result = mrb_debug_eval(mrb, mrdb->dbg, RSTRING_PTR(expr), RSTRING_LEN(expr), NULL, 0); + mrb_value result = mrb_debug_eval(mrb, mrdb->dbg, RSTRING_PTR(expr), RSTRING_LEN(expr), NULL, 0); /* $print_no = result */ printf("$%lu = ", (unsigned long)mrdb->print_no++); @@ -60,15 +55,10 @@ dbgcmd_eval(mrb_state *mrb, mrdb_state *mrdb) dbgcmd_state dbgcmd_info_local(mrb_state *mrb, mrdb_state *mrdb) { - mrb_value result; - mrb_value s; - int ai; + int ai = mrb_gc_arena_save(mrb); - ai = mrb_gc_arena_save(mrb); - - result = mrb_debug_eval(mrb, mrdb->dbg, "local_variables", 0, NULL, 1); - - s = mrb_str_cat_lit(mrb, result, "\0"); + mrb_value result = mrb_debug_eval(mrb, mrdb->dbg, "local_variables", 0, NULL, 1); + mrb_value s = mrb_str_cat_lit(mrb, result, "\0"); printf("$%lu = %s\n", (unsigned long)mrdb->print_no++, RSTRING_PTR(s)); if (mrdb->print_no == 0) {