summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-21 05:49:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-21 05:49:42 +0000
commitce0264b6f5dc41325abfd0b40abe6d8ad69976db (patch)
treeea2538b66676615c3bea6798deef47b4739f7da4
parent7f2ca5ba7a5afd95354d7ea9a39741cebff38e70 (diff)
* io.c (argf_set_encoding): uses current_file after check if next
input is available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--io.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ee043d61ca..1a9681143d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-Thu Feb 21 14:47:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 21 14:49:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (argf_set_encoding): uses current_file after check for next
- input.
+ * io.c (argf_set_encoding): uses current_file after check if next
+ input is available.
Thu Feb 21 11:10:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
diff --git a/io.c b/io.c
index c17fc9e93f..61cfa97b83 100644
--- a/io.c
+++ b/io.c
@@ -6103,7 +6103,7 @@ argf_set_encoding(int argc, VALUE *argv, VALUE io)
{
rb_io_t *fptr;
- if (next_argv()) {
+ if (!next_argv()) {
rb_raise(rb_eArgError, "no stream to set encoding");
}
rb_io_set_encoding(argc, argv, current_file);