kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name

Browse source 
is ascii compatible as well as Encoding.find.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-08-05 20:31:59 +00:00
parent 29732ed8f2
commit c97a842391
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Wed Aug 6 05:26:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 6 05:31:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name
is ascii compatible as well as Encoding.find.
* transcode.c (str_encode): no need to duplicate first. * transcode.c (str_encode): no need to duplicate first.

43
encoding.c
View file

@ -121,22 +121,33 @@ rb_to_encoding_index(VALUE enc)
else if (NIL_P(enc = rb_check_string_type(enc))) { else if (NIL_P(enc = rb_check_string_type(enc))) {
return -1; return -1;
} }
else { if (!rb_enc_asciicompat(rb_enc_get(enc))) {
return rb_enc_find_index(StringValueCStr(enc)); return -1;
} }
return rb_enc_find_index(StringValueCStr(enc));
}
static rb_encoding *
to_encoding(VALUE enc)
{
int idx;
StringValue(enc);
if (!rb_enc_asciicompat(rb_enc_get(enc))) {
rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
}
idx = rb_enc_find_index(StringValueCStr(enc));
if (idx < 0) {
rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
}
return rb_enc_from_index(idx);
} }
rb_encoding * rb_encoding *
rb_to_encoding(VALUE enc) rb_to_encoding(VALUE enc)
{ {
int idx; if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data;
return to_encoding(enc);
idx = enc_check_encoding(enc);
if (idx >= 0) return RDATA(enc)->data;
if ((idx = rb_enc_find_index(StringValueCStr(enc))) < 0) {
rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
}
return rb_enc_from_index(idx);
} }
void void
@ -838,17 +849,7 @@ enc_list(VALUE klass)
static VALUE static VALUE
enc_find(VALUE klass, VALUE enc) enc_find(VALUE klass, VALUE enc)
{ {
int idx; return rb_enc_from_encoding(to_encoding(enc));
StringValue(enc);
if (!rb_enc_asciicompat(rb_enc_get(enc))) {
rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
}
idx = rb_enc_find_index(StringValueCStr(enc));
if (idx < 0) {
rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
}
return rb_enc_from_encoding(rb_enc_from_index(idx));
} }
/* /*