From 12b74f698287f2fb4b5d6b20d02f810d808a45f6 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 14 Apr 2014 20:18:16 -0700 Subject: * stream.c (get_line, get_char, get_byte): Fix outdated, incorrect optional argument defaulting logic. --- ChangeLog | 5 +++++ stream.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c03c15be..62f01872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-14 Kaz Kylheku + + * stream.c (get_line, get_char, get_byte): Fix outdated, incorrect + optional argument defaulting logic. + 2014-04-13 Kaz Kylheku * eval.c, gc.c, rand.c, regex.c, signal.c: Remove inclusion of unneeded diff --git a/stream.c b/stream.c index 7122b6ff..75b51c97 100644 --- a/stream.c +++ b/stream.c @@ -1321,8 +1321,7 @@ val close_stream(val stream, val throw_on_error) val get_line(val stream) { - if (!stream) - stream = std_input; + stream = default_arg(stream, std_input); type_check (stream, COBJ); type_assert (stream->co.cls == stream_s, (lit("~a is not a stream"), @@ -1336,8 +1335,7 @@ val get_line(val stream) val get_char(val stream) { - if (!stream) - stream = std_input; + stream = default_arg(stream, std_input); type_check (stream, COBJ); type_assert (stream->co.cls == stream_s, (lit("~a is not a stream"), @@ -1351,8 +1349,7 @@ val get_char(val stream) val get_byte(val stream) { - if (!stream) - stream = std_input; + stream = default_arg(stream, std_input); type_check (stream, COBJ); type_assert (stream->co.cls == stream_s, (lit("~a is not a stream"), -- cgit v1.2.3