ruby-changes:10089
From: yugui <ko1@a...>
Date: Sat, 17 Jan 2009 21:20:07 +0900 (JST)
Subject: [ruby-changes:10089] Ruby:r21632 (ruby_1_9_1): merges r21611 from trunk into ruby_1_9_1.
yugui 2009-01-17 21:19:45 +0900 (Sat, 17 Jan 2009) New Revision: 21632 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21632 Log: 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. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/vm_dump.c Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21631) +++ ruby_1_9_1/ChangeLog (revision 21632) @@ -1,3 +1,9 @@ +Sat Jan 17 11:12:21 2009 Nobuyoshi Nakada <nobu@r...> + + * 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@y...> * configure.in (VCSUP): fixed the cases for git-svn or git. Index: ruby_1_9_1/vm_dump.c =================================================================== --- ruby_1_9_1/vm_dump.c (revision 21631) +++ ruby_1_9_1/vm_dump.c (revision 21632) @@ -246,24 +246,19 @@ 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 @@ 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"); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/