From 3e6742cffe3d015d1128b9e665a00cee7b14177c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 22 Aug 2015 06:45:44 +0000 Subject: [PATCH] string.c: move common statement * string.c (sym_inspect): move common statement and change variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/string.c b/string.c index f2a9b335fb..2563df6d4c 100644 --- a/string.c +++ b/string.c @@ -8811,29 +8811,26 @@ rb_id_quote_unprintable(ID id) static VALUE sym_inspect(VALUE sym) { - VALUE str; + VALUE str = rb_sym2str(sym); const char *ptr; long len; char *dest; - sym = rb_sym2str(sym); - if (!rb_str_symname_p(sym)) { - str = rb_str_inspect(sym); + if (!rb_str_symname_p(str)) { + str = rb_str_inspect(str); len = RSTRING_LEN(str); rb_str_resize(str, len + 1); dest = RSTRING_PTR(str); memmove(dest + 1, dest, len); - dest[0] = ':'; } else { - rb_encoding *enc = STR_ENC_GET(sym); - ptr = RSTRING_PTR(sym); - len = RSTRING_LEN(sym); + rb_encoding *enc = STR_ENC_GET(str); + RSTRING_GETMEM(str, ptr, len); str = rb_enc_str_new(0, len + 1, enc); dest = RSTRING_PTR(str); - dest[0] = ':'; memcpy(dest + 1, ptr, len); } + dest[0] = ':'; return str; }