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_enc_get_index): don't return -1.

Browse source 
* io.c (rb_scan_open_args): call FilePathValue before encoding
  conversion.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-15 14:29:09 +00:00
parent db14bfe4ea
commit a517395056
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Sep 15 23:28:28 2008 Tanaka Akira <akr@fsij.org>
* encoding.c (rb_enc_get_index): don't return -1.
* io.c (rb_scan_open_args): call FilePathValue before encoding
conversion.
Mon Sep 15 20:57:00 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> Mon Sep 15 20:57:00 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* lib/matrix.rb (Matrix#eql?): fixed [ruby-dev:36298]. * lib/matrix.rb (Matrix#eql?): fixed [ruby-dev:36298].

1
encoding.c
View file

@ -549,6 +549,7 @@ rb_enc_get_index(VALUE obj)
VALUE tmp; VALUE tmp;
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
default:
case T_STRING: case T_STRING:
case T_REGEXP: case T_REGEXP:
i = ENCODING_GET_INLINED(obj); i = ENCODING_GET_INLINED(obj);

2
io.c
View file

@ -4631,6 +4631,7 @@ rb_scan_open_args(int argc, VALUE *argv,
opt = pop_last_hash(&argc, &argv); opt = pop_last_hash(&argc, &argv);
rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm); rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
FilePathValue(fname);
#if defined _WIN32 || defined __APPLE__ #if defined _WIN32 || defined __APPLE__
{ {
static rb_encoding *fs_encoding; static rb_encoding *fs_encoding;
@ -4650,7 +4651,6 @@ rb_scan_open_args(int argc, VALUE *argv,
} }
} }
#endif #endif
FilePathValue(fname);
rb_io_extract_modeenc(&vmode, opt, &oflags, &fmode, convconfig_p); rb_io_extract_modeenc(&vmode, opt, &oflags, &fmode, convconfig_p);