From 37d6a4dd9941afdbb11c7a8e24cd935b8852a7e6 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 25 Feb 2016 12:36:24 +0000 Subject: eval_error.c: remove warn_printf * eval_error.c (warn_printf): remove. * eval_error.c (error_pos_str): return error position string, split from error_pos. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 91fb2c9e9f..67a5d0e53b 100644 --- a/eval.c +++ b/eval.c @@ -534,17 +534,18 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) e = rb_obj_as_string(mesg); th->errinfo = mesg; if (file && line) { - warn_printf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n", - rb_obj_class(mesg), file, line, e); + e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n", + rb_obj_class(mesg), file, line, e); } else if (file) { - warn_printf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n", - rb_obj_class(mesg), file, e); + e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n", + rb_obj_class(mesg), file, e); } else { - warn_printf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n", - rb_obj_class(mesg), e); + e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n", + rb_obj_class(mesg), e); } + warn_print_str(e); } TH_POP_TAG(); if (status == TAG_FATAL && th->errinfo == exception_error) { -- cgit v1.2.3