From d7bd3d54f75d24905a44655f750de57964ab58a1 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Jan 2009 12:19:45 +0000
Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 vm_dump.c | 9 ++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4aa5b8d0b..69a9cdd74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/vm_dump.c b/vm_dump.c
index 2098f129d..aa49b0a54 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -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");
-- 
cgit