aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 05:59:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 05:59:24 +0000
commitad1e42421cc06037f1c3f6622c6ce7775690941c (patch)
treea47ad9f421de0609ab302b60366454d389b19cb5
parentfc5885aa7a6be99bf19a827a42d1de157a1f4a94 (diff)
downloadruby-ad1e42421cc06037f1c3f6622c6ce7775690941c.tar.gz
* io.c (rb_io_initialize, argf_each_line, argf_each_byte): suppress
warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f02a7dc3..053f3d5d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 15 14:59:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_initialize, argf_each_line, argf_each_byte): suppress
+ warnings.
+
Wed Aug 15 14:22:05 2007 Koichi Sasada <ko1@atdot.net>
* parse.y: remove "//" type comment.
diff --git a/io.c b/io.c
index ba3cf663f4..dfefad4000 100644
--- a/io.c
+++ b/io.c
@@ -4157,7 +4157,7 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
{
VALUE fnum, mode, orig;
rb_io_t *fp, *ofp = NULL;
- int fd, flags, fmode;
+ int fd, fmode, flags = O_RDONLY;
rb_secure(4);
rb_scan_args(argc, argv, "11", &fnum, &mode);
@@ -4177,8 +4177,6 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
#if defined(HAVE_FCNTL) && defined(F_GETFL)
flags = fcntl(fd, F_GETFL);
if (flags == -1) rb_sys_fail(0);
-#else
- flags = O_RDONLY;
#endif
}
MakeOpenFile(io, fp);
@@ -5468,8 +5466,6 @@ argf_readchar(void)
static VALUE
argf_each_line(int argc, VALUE *argv, VALUE self)
{
- VALUE str;
-
RETURN_ENUMERATOR(self, argc, argv);
for (;;) {
if (!next_argv()) return Qnil;
@@ -5482,8 +5478,6 @@ argf_each_line(int argc, VALUE *argv, VALUE self)
static VALUE
argf_each_byte(VALUE self)
{
- VALUE byte;
-
RETURN_ENUMERATOR(self, 0, 0);
for (;;) {
if (!next_argv()) return Qnil;