diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-20 17:31:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-20 17:31:53 +0000 |
commit | e6c300e08a0d055bbaf2a8fd95507f2544906594 (patch) | |
tree | 6709a6b7b5a697b2eff1483808814db9cf64e39e /io.c | |
parent | 65337c5b2d56c70440f1677f2b175270d77ea0d1 (diff) | |
download | ruby-e6c300e08a0d055bbaf2a8fd95507f2544906594.tar.gz |
* io.c (prep_io): local variable renamed.
(rb_io_fdopen): ditto.
(prep_stdio): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -5376,7 +5376,7 @@ stdout_setter(VALUE val, ID id, VALUE *variable) } static VALUE -prep_io(int fd, int mode, VALUE klass, const char *path) +prep_io(int fd, int flags, VALUE klass, const char *path) { rb_io_t *fp; VALUE io = io_alloc(klass); @@ -5385,11 +5385,11 @@ prep_io(int fd, int mode, VALUE klass, const char *path) fp->fd = fd; #ifdef __CYGWIN__ if (!isatty(fd)) { - mode |= FMODE_BINMODE; + flags |= FMODE_BINMODE; setmode(fd, O_BINARY); } #endif - fp->mode = mode; + fp->mode = flags; io_check_tty(fp); if (path) fp->path = strdup(path); @@ -5397,19 +5397,19 @@ prep_io(int fd, int mode, VALUE klass, const char *path) } VALUE -rb_io_fdopen(int fd, int mode, const char *path) +rb_io_fdopen(int fd, int modenum, const char *path) { VALUE klass = rb_cIO; if (path && strcmp(path, "-")) klass = rb_cFile; - return prep_io(fd, rb_io_modenum_flags(mode), klass, path); + return prep_io(fd, rb_io_modenum_flags(modenum), klass, path); } static VALUE -prep_stdio(FILE *f, int mode, VALUE klass, const char *path) +prep_stdio(FILE *f, int flags, VALUE klass, const char *path) { rb_io_t *fptr; - VALUE io = prep_io(fileno(f), mode|FMODE_PREP, klass, path); + VALUE io = prep_io(fileno(f), flags|FMODE_PREP, klass, path); GetOpenFile(io, fptr); fptr->stdio_file = f; |