aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-03 10:12:02 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-03 10:12:02 +0000
commit265aaee91cc9ebe9015df33c11176870a66bb9cd (patch)
tree39497ca8029d36d6031f9963f49a7e2b00a07c53
parent16f70ed4ba2a094d77eada4532fe50dd4d4a2a8a (diff)
downloadruby-265aaee91cc9ebe9015df33c11176870a66bb9cd.tar.gz
* io.c (rb_io_getline): lineno update condition was wrong.
[ruby-dev:30065] * io.c (rb_io_getline_fast): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--io.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a0074b686..4b3d499799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 3 18:49:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_getline): lineno update condition was wrong.
+ [ruby-dev:30065]
+
+ * io.c (rb_io_getline_fast): ditto.
+
Wed Jan 3 11:36:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (ruby_dup): start GC on ENOMEM as well.
diff --git a/io.c b/io.c
index 9e8710897c..35c406a2a3 100644
--- a/io.c
+++ b/io.c
@@ -1644,7 +1644,7 @@ rb_io_getline_fast(OpenFile *fptr, unsigned char delim, long limit)
}
if (!NIL_P(str)) {
- if (limit > 0) {
+ if (limit != 0) {
fptr->lineno++;
lineno = INT2FIX(fptr->lineno);
}
@@ -1740,7 +1740,7 @@ rb_io_getline(int argc, VALUE *argv, VALUE io)
}
if (!NIL_P(str)) {
- if (limit > 0) {
+ if (limit != 0) {
fptr->lineno++;
lineno = INT2FIX(fptr->lineno);
}