summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-30 14:31:53 +0000
committerktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-30 14:31:53 +0000
commite3230f154c874917f9c4384498558da3fdaba432 (patch)
treef1a6d4292154a1dd5ff5e1e898a8db7e7b2617d5
parenta0dc245f72afba5889a528074d079d310effeb3b (diff)
* sprintf.c (rb_str_format): like r47006, get rid of
function calls in RSTRING_PTR(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--sprintf.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5acf7060cf5..4663d1c22cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 30 23:28:10 2014 Kazuki Tsujimoto <kazuki@callcc.net>
+
+ * sprintf.c (rb_str_format): like r47006, get rid of
+ function calls in RSTRING_PTR().
+
Wed Jul 30 22:10:29 2014 Kazuki Tsujimoto <kazuki@callcc.net>
* process.c (rlimit_resource_type, rlimit_resource_value):
diff --git a/sprintf.c b/sprintf.c
index 3d2d6db4b65..c4f304fafc5 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -602,8 +602,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
#endif
len = (int)(p - start + 1); /* including parenthesis */
if (sym != Qnil) {
- rb_enc_raise(enc, rb_eArgError, "named%.*s after <%s>",
- len, start, RSTRING_PTR(rb_sym2str(sym)));
+ rb_enc_raise(enc, rb_eArgError, "named%.*s after <%"PRIsVALUE">",
+ len, start, rb_sym2str(sym));
}
CHECKNAMEARG(start, len, enc);
get_hash(&hash, argc, argv);