diff --git a/ChangeLog b/ChangeLog index 239d6d009c..aba1b8e3f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed May 21 07:42:28 2008 NARUSE, Yui + + * string.c (rb_usascii_str_new): use rb_str_new. + + * string.c (rb_enc_str_new): ditto. + + * string.c (rb_usascii_str_new2): use rb_str_new2. + Wed May 21 07:22:01 2008 NARUSE, Yui * encoding.c, include/ruby/encoding.h diff --git a/string.c b/string.c index 2f20d3dc88..eb41c0db10 100644 --- a/string.c +++ b/string.c @@ -385,8 +385,7 @@ rb_str_new(const char *ptr, long len) VALUE rb_usascii_str_new(const char *ptr, long len) { - VALUE str = str_new(rb_cString, ptr, len); - + VALUE str = rb_str_new(ptr, len); ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT); return str; } @@ -394,8 +393,7 @@ rb_usascii_str_new(const char *ptr, long len) VALUE rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) { - VALUE str = str_new(rb_cString, ptr, len); - + VALUE str = rb_str_new(ptr, len); rb_enc_associate(str, enc); return str; } @@ -412,10 +410,9 @@ rb_str_new2(const char *ptr) VALUE rb_usascii_str_new2(const char *ptr) { - if (!ptr) { - rb_raise(rb_eArgError, "NULL pointer given"); - } - return rb_usascii_str_new(ptr, strlen(ptr)); + VALUE str = rb_str_new2(ptr); + ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT); + return str; } VALUE