diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-15 04:49:20 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-15 04:49:20 +0000 |
commit | f59caa2950d454f651438cccff6298c4e13dc354 (patch) | |
tree | a824d7af059a691eccf8f0df3c8de1396bea42e3 /hash.c | |
parent | fcaee4bd64eb06ec4d0afd4e7e32ccf57acb5dc8 (diff) |
* 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
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |