summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-17 02:11:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-17 02:11:21 +0000
commitf09bcbf96e19959a1a521f174a8b80a1482f02fb (patch)
tree6be838426dfc3fcbfbbd749702a0686c3e21f4f1
parent6184d1d52a68fe2f3ac5951245d951ad6a0cfd50 (diff)
* 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/trunk@21611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--version.h4
-rw-r--r--vm_dump.c9
3 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ae7053646e..12312032ad 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.
+
Fri Jan 16 22:30:27 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c: move addrinfo code.
diff --git a/version.h b/version.h
index 849a00a303..fa9e06f3f3 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_RELEASE_DATE "2009-01-16"
+#define RUBY_RELEASE_DATE "2009-01-17"
#define RUBY_PATCHLEVEL 5000
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/vm_dump.c b/vm_dump.c
index 2098f129dd..aa49b0a54e 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");