From 427bcc40ac818e5f3525a117c0848c89bca6db45 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 24 Dec 2012 15:57:51 +0000 Subject: error.c: VALUE to messages * error.c (name_err_mesg_to_str, syserr_initialize): use VALUE to format messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'error.c') diff --git a/error.c b/error.c index 2dfe4ed119..67d486d87d 100644 --- a/error.c +++ b/error.c @@ -1097,7 +1097,7 @@ name_err_mesg_to_str(VALUE obj) if (desc && desc[0] != '#') { d = d ? rb_str_dup(d) : rb_str_new2(desc); rb_str_cat2(d, ":"); - rb_str_cat2(d, rb_obj_classname(obj)); + rb_str_append(d, rb_class_name(CLASS_OF(obj))); } args[0] = mesg; args[1] = ptr[2]; @@ -1246,8 +1246,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self) VALUE str = StringValue(mesg); rb_encoding *me = rb_enc_get(mesg); - mesg = rb_sprintf("%s - %.*s", err, - (int)RSTRING_LEN(str), RSTRING_PTR(str)); + mesg = rb_sprintf("%s - %"PRIsVALUE, err, mesg); if (le != me && rb_enc_asciicompat(me)) { le = me; }/* else assume err is non ASCII string. */ -- cgit v1.2.3