From c00af0ef1d6ab226c94aa8a618b1860b183d25b2 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Apr 2009 14:03:33 +0000 Subject: merges r22901 from trunk into ruby_1_9_1. -- * iseq.c (rb_iseq_disasm): RSTRING_LEN() returns long. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- iseq.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 584cca5c1..47d468fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Thu Mar 12 05:16:07 2009 Nobuyoshi Nakada +Thu Mar 12 05:19:22 2009 Nobuyoshi Nakada + + * iseq.c (rb_iseq_disasm): RSTRING_LEN() returns long. * process.c (rb_f_sleep): time() needs time_t. diff --git a/iseq.c b/iseq.c index 146d52e30..69cdd7fe1 100644 --- a/iseq.c +++ b/iseq.c @@ -851,6 +851,7 @@ rb_iseq_disasm(VALUE self) VALUE child = rb_ary_new(); unsigned long size; int i; + long l; ID *tbl; enum {header_minlen = 72}; @@ -862,9 +863,9 @@ rb_iseq_disasm(VALUE self) rb_str_cat2(str, "== disasm: "); rb_str_concat(str, iseq_inspect(iseqdat->self)); - if ((i = RSTRING_LEN(str)) < header_minlen) { + if ((l = RSTRING_LEN(str)) < header_minlen) { rb_str_resize(str, header_minlen); - memset(RSTRING_PTR(str) + i, '=', header_minlen - i); + memset(RSTRING_PTR(str) + l, '=', header_minlen - l); } rb_str_cat2(str, "\n"); -- cgit