1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2009-01-17 02:11:21 +00:00
parent 6184d1d52a
commit f09bcbf96e
3 changed files with 10 additions and 9 deletions

View file

@ -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> Fri Jan 16 22:30:27 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c: move addrinfo code. * ext/socket/socket.c: move addrinfo code.

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #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_PATCHLEVEL 5000
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 16 #define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];

View file

@ -246,24 +246,19 @@ vm_stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
VALUE *lfp = cfp->lfp; VALUE *lfp = cfp->lfp;
VALUE *dfp = cfp->dfp; VALUE *dfp = cfp->dfp;
int argc = 0, local_size; int argc = 0, local_size = 0;
const char *name; const char *name;
rb_iseq_t *iseq = cfp->iseq; rb_iseq_t *iseq = cfp->iseq;
if (iseq == 0) { if (iseq == 0) {
if (RUBYVM_CFUNC_FRAME_P(cfp)) { if (RUBYVM_CFUNC_FRAME_P(cfp)) {
argc = 0;
local_size = 0;
name = rb_id2name(cfp->method_id); name = rb_id2name(cfp->method_id);
} }
else { else {
name = "?"; name = "?";
local_size = 0;
} }
} }
else if (RUBY_VM_IFUNC_P(iseq)) { else if (RUBY_VM_IFUNC_P(iseq)) {
argc = 0;
local_size = 0;
name = "<ifunc>"; name = "<ifunc>";
} }
else { else {
@ -605,7 +600,7 @@ rb_vm_bugreport(void)
fprintf(stderr, "-- C level backtrace information " fprintf(stderr, "-- C level backtrace information "
"-------------------------------------------\n"); "-------------------------------------------\n");
for (i=0; i<n; i++) { 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, "%p %s\n", trace[i], info);
} }
fprintf(stderr, "\n"); fprintf(stderr, "\n");