From 75632170414b1aa033593e490e5d55a9faed4316 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 6 Dec 2015 12:13:25 +0000 Subject: hash.c: fix rubyspec failure * hash.c (env_fetch): yield coerced string. * hash.c (env_assoc): return coerced string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'hash.c') diff --git a/hash.c b/hash.c index 35e4e54578..b0489502b0 100644 --- a/hash.c +++ b/hash.c @@ -3043,7 +3043,7 @@ rb_f_getenv(VALUE obj, VALUE name) static VALUE env_fetch(int argc, VALUE *argv) { - VALUE key, name; + VALUE key; long block_given; const char *nam, *env; @@ -3053,8 +3053,7 @@ env_fetch(int argc, VALUE *argv) if (block_given && argc == 2) { rb_warn("block supersedes default value argument"); } - name = key; - nam = env_name(name); + nam = env_name(key); env = getenv(nam); if (!env) { if (block_given) return rb_yield(key); @@ -3842,9 +3841,8 @@ static VALUE env_assoc(VALUE env, VALUE key) { const char *s, *e; - VALUE name = key; - s = env_name(name); + s = env_name(key); e = getenv(s); if (e) return rb_assoc_new(key, rb_tainted_str_new2(e)); return Qnil; -- cgit v1.2.3