From 38d5918439dd6f19e1e2350cb3c37a4331b8abbf Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 27 Jul 2005 14:29:13 +0000 Subject: * gc.c (obj_free): make message formant consistent with one from gc_mark(). [ruby-talk:149668] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 4 ++-- gc.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae10d24c64..2ea24a45de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 27 23:23:54 2005 Yukihiro Matsumoto + + * gc.c (obj_free): make message formant consistent with one from + gc_mark(). [ruby-talk:149668] + Wed Jul 27 22:11:37 2005 Kouhei Sutou * sample/rss/tdiary_plugin: removed. because the plugin diff --git a/eval.c b/eval.c index 90f8d692fb..3ac7d07e2a 100644 --- a/eval.c +++ b/eval.c @@ -8511,13 +8511,13 @@ proc_to_s(self) len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3; str = rb_str_new(0, len); snprintf(RSTRING(str)->ptr, len+1, - "#<%s:0x%lx@%s:%d>", cname, (VALUE)data->body, + "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body, node->nd_file, nd_line(node)); } else { str = rb_str_new(0, len); snprintf(RSTRING(str)->ptr, len+1, - "#<%s:0x%lx>", cname, (VALUE)data->body); + "#<%s:0x%.*lx>", cname, w, (VALUE)data->body); } RSTRING(str)->len = strlen(RSTRING(str)->ptr); if (OBJ_TAINTED(self)) OBJ_TAINT(str); diff --git a/gc.c b/gc.c index 7a2ae7decf..ca3862f0b4 100644 --- a/gc.c +++ b/gc.c @@ -1256,8 +1256,8 @@ obj_free(obj) break; default: - rb_bug("gc_sweep(): unknown data type 0x%lx(%ld)", obj, - RANY(obj)->as.basic.flags & T_MASK); + rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)", + RANY(obj)->as.basic.flags & T_MASK, obj); } } -- cgit v1.2.3