diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-20 22:48:49 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-20 22:48:49 +0000 |
commit | 102f94455c87eb63ac137217b366be9f60e844d7 (patch) | |
tree | 4126da7c1a4054faffe2a4defe43dbe312576c71 /string.c | |
parent | fe8bb861255035f7903c6f332f3cc87368a9c410 (diff) | |
download | ruby-102f94455c87eb63ac137217b366be9f60e844d7.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -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 |