From f59caa2950d454f651438cccff6298c4e13dc354 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Mar 2012 04:49:20 +0000
Subject: * hash.c (env_str_new, rb_f_getenv, env_fetch): use rb_str_conv_enc()
   instead of rb_str_encode() to simplify the code.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 hash.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'hash.c')

diff --git a/hash.c b/hash.c
index ee703f59d4..e9937ffe71 100644
--- a/hash.c
+++ b/hash.c
@@ -2032,7 +2032,7 @@ static VALUE
 env_str_new(const char *ptr, long len)
 {
 #ifdef _WIN32
-    VALUE str = rb_str_encode(rb_enc_str_new(ptr, len, rb_utf8_encoding()), rb_enc_from_encoding(rb_locale_encoding()), 0, Qnil);
+    VALUE str = rb_str_conv_enc(rb_str_new(ptr, len), rb_utf8_encoding(), rb_locale_encoding());
 #else
     VALUE str = rb_locale_str_new(ptr, len);
 #endif
@@ -2115,7 +2115,7 @@ rb_f_getenv(VALUE obj, VALUE name)
     if (env) {
 	if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) {
 #ifdef _WIN32
-	    VALUE str = rb_str_encode(rb_enc_str_new(env, strlen(env), rb_utf8_encoding()), rb_enc_from_encoding(rb_filesystem_encoding()), 0, Qnil);
+	    VALUE str = rb_str_conv_enc(rb_str_new(env, strlen(env)), rb_utf8_encoding(), rb_filesystem_encoding());
 #else
 	    VALUE str = rb_filesystem_str_new_cstr(env);
 #endif
@@ -2170,7 +2170,7 @@ env_fetch(int argc, VALUE *argv)
     }
     if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env))
 #ifdef _WIN32
-	return rb_str_encode(rb_enc_str_new(env, strlen(env), rb_utf8_encoding()), rb_enc_from_encoding(rb_filesystem_encoding()), 0, Qnil);
+	return rb_str_conv_enc(rb_str_new(env, strlen(env)), rb_utf8_encoding(), rb_filesystem_encoding());
 #else
 	return rb_filesystem_str_new_cstr(env);
 #endif
-- 
cgit v1.2.3