summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-28 18:13:45 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-28 18:13:45 +0000
commit50a860d00635c6de5e32fe753b3adae596192f6d (patch)
treebe3def93895c7a46b2af01b4f7069170c5ea9380 /hash.c
parent3cb57fb1c3c2b25bd94660c099f52489a1564354 (diff)
* string.c (str_new): remove encoding assumption of empty string.
* hash.c ( rb_f_getenv, env_fetch, env_inspect): result of ENV should be always ASCII-8BIT. * object.c (nil_to_s): nil.to_s should be US-ASCII. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hash.c b/hash.c
index 53711b2cc2..578e4cd395 100644
--- a/hash.c
+++ b/hash.c
@@ -1826,7 +1826,7 @@ rb_f_getenv(VALUE obj, VALUE name)
if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
#endif
{
- VALUE str = rb_usascii_str_new2(env);
+ VALUE str = rb_str_new2(env);
rb_obj_freeze(str);
return str;
@@ -1867,7 +1867,7 @@ env_fetch(int argc, VALUE *argv)
#else
if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
#endif
- return rb_usascii_str_new2(env);
+ return rb_str_new2(env);
return env_str_new2(env);
}
@@ -2244,7 +2244,7 @@ env_inspect(void)
rb_str_buf_cat2(str, "\"");
rb_str_buf_cat(str, *env, s-*env);
rb_str_buf_cat2(str, "\"=>");
- i = rb_inspect(rb_usascii_str_new2(s+1));
+ i = rb_inspect(rb_str_new2(s+1));
rb_str_buf_append(str, i);
}
env++;