summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--proc.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f49d0356b..5fe8d14f26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 24 16:10:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * proc.c (proc_to_s): suppress warning, and reduced duplicated code.
+
Sun Jun 24 15:33:47 2007 Koichi Sasada <ko1@atdot.net>
* bootstraptest/runner.rb: set default directory to
diff --git a/proc.c b/proc.c
index 4a4943b8c1..1b7208244a 100644
--- a/proc.c
+++ b/proc.c
@@ -542,6 +542,7 @@ proc_to_s(VALUE self)
rb_proc_t *proc;
char *cname = rb_obj_classname(self);
rb_iseq_t *iseq;
+ const char *is_lambda = proc->is_lambda ? " (lambda)" : "";
GetProcPtr(self, proc);
iseq = proc->block.iseq;
@@ -552,14 +553,13 @@ proc_to_s(VALUE self)
if (iseq->insn_info_tbl) {
line_no = iseq->insn_info_tbl[0].line_no;
}
- str = rb_sprintf("#<%s:%p@%s:%d%s>", cname, self,
+ str = rb_sprintf("#<%s:%p@%s:%d%s>", cname, (void *)self,
RSTRING_PTR(iseq->filename),
- line_no,
- proc->is_lambda ? " (lambda)" : "");
+ line_no, is_lambda);
}
else {
str = rb_sprintf("#<%s:%p%s>", cname, proc->block.iseq,
- proc->is_lambda ? " (lambda)" : "");
+ is_lambda);
}
if (OBJ_TAINTED(self)) {