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

* io.c (swallow): removed condition using an unset variable.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-08-25 06:20:48 +00:00
parent 000b6e22f4
commit 8bbac3ba77
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Aug 25 15:20:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (swallow): removed condition using an unset variable.
Sat Aug 25 11:45:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* encoding.c: provide basic features for M17N.

16
io.c
View file

@ -18,6 +18,10 @@
#include <ctype.h>
#include <errno.h>
#if defined(DOSISH) || defined(__CYGWIN__)
#include <io.h>
#endif
#include <sys/types.h>
#if !defined(_WIN32) && !defined(__DJGPP__)
# if defined(__BEOS__)
@ -1616,8 +1620,6 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
static inline int
swallow(rb_io_t *fptr, int term)
{
int c;
do {
long cnt;
while ((cnt = READ_DATA_PENDING_COUNT(fptr)) > 0) {
@ -1633,10 +1635,7 @@ swallow(rb_io_t *fptr, int term)
}
rb_thread_wait_fd(fptr->fd);
rb_io_check_closed(fptr);
if (io_fillbuf(fptr) < 0) {
break;
}
} while (c != EOF);
} while (io_fillbuf(fptr) == 0);
return Qfalse;
}
@ -4435,7 +4434,10 @@ next_argv(void)
int fr = rb_sysopen(fn, O_RDONLY, 0);
if (ruby_inplace_mode) {
struct stat st, st2;
struct stat st;
#ifndef NO_SAFE_RENAME
struct stat st2;
#endif
VALUE str;
int fw;