summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Williams <samuel.williams@oriontransfer.co.nz>2021-12-25 02:26:06 +1300
committerGitHub <noreply@github.com>2021-12-25 02:26:06 +1300
commit548c8f5f7aa743ae05610ed372f857a6b488e89c (patch)
treebdc446ba451f08e777c89c57d8ea23de6ed61fdb
parent4f74153846d951dd8ec66017f4e8e286df8ea925 (diff)
Prefer to use RTEST when checking result of `rb_io_wait`. (#5341)
* Prefer to use RTEST when checking result of `rb_io_wait`. * Consistently use false for signifying no events ready.
Notes
Notes: Merged-By: ioquatix <samuel@codeotaku.com>
-rw-r--r--ext/io/console/console.c2
-rw-r--r--io.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index 5dec1a4c06..4c5f89f80d 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -556,7 +556,7 @@ console_getch(int argc, VALUE *argv, VALUE io)
if (!(w & RB_WAITFD_IN)) return Qnil;
# else
VALUE result = rb_io_wait(io, RUBY_IO_READABLE, timeout);
- if (result == Qfalse) return Qnil;
+ if (!RTEST(result)) return Qnil;
# endif
}
else if (optp->vtime) {
diff --git a/io.c b/io.c
index f104ff5371..4ed4ee34f8 100644
--- a/io.c
+++ b/io.c
@@ -1483,7 +1483,7 @@ rb_io_maybe_wait(int error, VALUE io, VALUE events, VALUE timeout)
default:
// Non-specific error, no event is ready:
- return RB_INT2NUM(0);
+ return Qfalse;
}
}