diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 03:38:06 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 03:38:06 +0000 |
commit | ff80e84db969c41e60771981d5236ecb474360b7 (patch) | |
tree | 23c47f4be02366831993f9c2cf09c8827022cbde /io.c | |
parent | d4beba3f3ef026f56ecae9fc4fed963dd819d620 (diff) |
* io.c (appendline): reformed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 23 |
1 files changed, 9 insertions, 14 deletions
@@ -2016,7 +2016,7 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp) if (NEED_READCONV(fptr)) { make_readconv(fptr, 0); - while (1) { + do { const char *p, *e; int searchlen; if (fptr->cbuf_len) { @@ -2050,15 +2050,12 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp) return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1]; } } - - if (more_char(fptr) == -1) { - *lp = limit; - return EOF; - } - } + } while (more_char(fptr) != -1); + *lp = limit; + return EOF; } - while (1) { + do { long pending = READ_DATA_PENDING_COUNT(fptr); if (pending > 0) { const char *p = READ_DATA_PENDING_PTR(fptr); @@ -2082,15 +2079,13 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp) *lp = limit; if (e) return delim; if (limit == 0) - return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1]; + return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1]; } rb_thread_wait_fd(fptr->fd); rb_io_check_closed(fptr); - if (io_fillbuf(fptr) < 0) { - *lp = limit; - return EOF; - } - } + } while (io_fillbuf(fptr) >= 0); + *lp = limit; + return EOF; } static inline int |