5 files changed, 10 insertions, 9 deletions

diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c b/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c
index cddcab270..8234e05dc 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c
@@ -105,7 +105,8 @@ source_file_new(mrb_state *mrb, mrb_debug_context *dbg, char *filename)
 static mrb_bool
 remove_newlines(char *s, FILE *fp)
 {
-  char c, *p;
+  int c;
+  char *p;
   size_t len;
 
   if ((len = strlen(s)) == 0) {
@@ -120,7 +121,7 @@ remove_newlines(char *s, FILE *fp)
 
   if (*p == '\r') {
     /* peek the next character and skip '\n' */
-    if ((unsigned char)(c = fgetc(fp)) != '\n') {
+    if ((c = fgetc(fp)) != '\n') {
       ungetc(c, fp);
     }
   }
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c b/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
index 23b321f7c..2c93eb4ee 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
@@ -33,7 +33,7 @@ mrdb_check_syntax(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size
 mrb_value
 mrb_debug_eval(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len, mrb_bool *exc)
 {
-  void *tmp;
+  void (*tmp)(struct mrb_state *, struct mrb_irep *, mrb_code *, mrb_value *);
   mrb_value ruby_code;
   mrb_value s;
   mrb_value v;
@@ -56,9 +56,9 @@ mrb_debug_eval(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t
      *   e
      * end
      */
-    ruby_code = mrb_str_new_cstr(mrb, "begin\n");
+    ruby_code = mrb_str_new_lit(mrb, "begin\n");
     ruby_code = mrb_str_cat(mrb, ruby_code, expr, len);
-    ruby_code = mrb_str_cat_cstr(mrb, ruby_code, "\nrescue => e\ne\nend");
+    ruby_code = mrb_str_cat_lit(mrb, ruby_code, "\nrescue => e\ne\nend");
 
     recv = dbg->regs[0];
 
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
index b8d62ac07..74e10ab5a 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
@@ -411,11 +411,11 @@ dbgcmd_list(mrb_state *mrb, mrdb_state *mrdb)
       filename = st->filename;
     }
     mrb_debug_list(mrb, mrdb->dbg, filename, st->line_min, st->line_max);
-    listcmd_parser_state_free(mrb, st);
 
     if (filename != NULL && filename != st->filename) {
       mrb_free(mrb, filename);
     }
+    listcmd_parser_state_free(mrb, st);
   }
 
   return DBGST_PROMPT;
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c
index 16b811edb..a617aff13 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c
@@ -32,14 +32,14 @@ dbgcmd_print(mrb_state *mrb, mrdb_state *mrdb)
   /* eval expr */
   expr = mrb_str_new_cstr(mrb, NULL);
   for (wcnt=1; wcnt<mrdb->wcnt; wcnt++) {
-    expr = mrb_str_cat_cstr(mrb, expr, " ");
+    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);
 
   /* $print_no = result */
-  s = mrb_str_cat_cstr(mrb, result, "\0");
+  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) {
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
index 7a0c37b2c..a0969a3ac 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
@@ -503,7 +503,7 @@ get_and_parse_command(mrb_state *mrb, mrdb_state *mrdb)
   return cmd;
 }
 
-static const int32_t
+static int32_t
 check_method_breakpoint(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *regs)
 {
   struct RClass* c;