aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-03 20:34:58 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-03 20:34:58 +0000
commit8ac9b7c2ed7b0da6b7c9380e9977fda46c6d24f8 (patch)
tree53999c68778606db15e910566e2cd1e96a177bd4
parent10a0d4b61dd575be73c2e2b6223f1bf7d34c63ea (diff)
downloadruby-8ac9b7c2ed7b0da6b7c9380e9977fda46c6d24f8.tar.gz
* io.c (open_key_args): use rb_io_open instead of rb_f_open.
[ruby-core:15746] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c6
-rw-r--r--version.h6
3 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e1660f6b32..2ce2f58a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 04 05:30:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (open_key_args): use rb_io_open instead of rb_f_open.
+ [ruby-core:15746]
+
Mon Mar 3 23:28:37 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpservlet/filehandler.rb: should normalize path
diff --git a/io.c b/io.c
index 55959802a4..f6e8bfb5ce 100644
--- a/io.c
+++ b/io.c
@@ -5932,11 +5932,7 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
}
v = rb_hash_aref(opt, mode);
if (!NIL_P(v)) {
- VALUE args[2];
-
- args[0] = argv[0];
- args[1] = v;
- arg->io = rb_f_open(2, args);
+ arg->io = rb_io_open(RSTRING_PTR(argv[0]), StringValueCStr(v));
}
if (!arg->io) {
diff --git a/version.h b/version.h
index c4d006b45c..6de4ed9e71 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-03-03"
+#define RUBY_RELEASE_DATE "2008-03-04"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080303
+#define RUBY_RELEASE_CODE 20080304
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];