summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--eval.c4
-rw-r--r--gc.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ae10d24..2ea24a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 27 23:23:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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 <kou@cozmixng.org>
* sample/rss/tdiary_plugin: removed. because the plugin
diff --git a/eval.c b/eval.c
index 90f8d69..3ac7d07 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 7a2ae7d..ca3862f 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);
}
}