Merge pull request #2275 from suzukaze/refactor-string.c-2

Refactor string.c Fix #2267
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-05-17 13:32:55 +09:00
+3 -12
View File
@@ -277,10 +277,7 @@ str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len)
mrb_value
mrb_str_new(mrb_state *mrb, const char *p, size_t len)
{
struct RString *s;
s = str_new(mrb, p, len);
return mrb_obj_value(s);
return mrb_obj_value(str_new(mrb, p, len));
}
/*
@@ -666,12 +663,10 @@ static mrb_value
mrb_str_equal_m(mrb_state *mrb, mrb_value str1)
{
mrb_value str2;
mrb_bool equal_p;
mrb_get_args(mrb, "o", &str2);
equal_p = mrb_str_equal(mrb, str1, str2);
return mrb_bool_value(equal_p);
return mrb_bool_value(mrb_str_equal(mrb, str1, str2));
}
/* ---------------------------------- */
mrb_value
@@ -1489,11 +1484,7 @@ mrb_str_init(mrb_state *mrb, mrb_value self)
mrb_value
mrb_str_intern(mrb_state *mrb, mrb_value self)
{
mrb_sym id;
id = mrb_intern_str(mrb, self);
return mrb_symbol_value(id);
return mrb_symbol_value(mrb_intern_str(mrb, self));
}
/* ---------------------------------- */
mrb_value