diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:45 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:45 +0000 |
commit | 1b517144e3ad7577f987973b75a9ca3ad61d8a1e (patch) | |
tree | 635cf534ff0abf75a6d4f1777a06b1749201fd76 | |
parent | 0962222856126aa7b1f5763ed48751cd700e9359 (diff) |
merges r21611 from trunk into ruby_1_9_1.
* vm_dump.c (vm_stack_dump_each): initialized at declarations.
* vm_dump.c (rb_vm_bugreport): constified to suppress a warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | vm_dump.c | 9 |
2 files changed, 8 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Sat Jan 17 11:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_dump.c (vm_stack_dump_each): initialized at declarations. + + * vm_dump.c (rb_vm_bugreport): constified to suppress a warning. + Sat Jan 17 19:33:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * configure.in (VCSUP): fixed the cases for git-svn or git. @@ -246,24 +246,19 @@ vm_stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp) VALUE *lfp = cfp->lfp; VALUE *dfp = cfp->dfp; - int argc = 0, local_size; + int argc = 0, local_size = 0; const char *name; rb_iseq_t *iseq = cfp->iseq; if (iseq == 0) { if (RUBYVM_CFUNC_FRAME_P(cfp)) { - argc = 0; - local_size = 0; name = rb_id2name(cfp->method_id); } else { name = "?"; - local_size = 0; } } else if (RUBY_VM_IFUNC_P(iseq)) { - argc = 0; - local_size = 0; name = "<ifunc>"; } else { @@ -605,7 +600,7 @@ rb_vm_bugreport(void) fprintf(stderr, "-- C level backtrace information " "-------------------------------------------\n"); for (i=0; i<n; i++) { - char *info = syms ? syms[i] : ""; + const char *info = syms ? syms[i] : ""; fprintf(stderr, "%p %s\n", trace[i], info); } fprintf(stderr, "\n"); |