From 567baab047c82c17c7e3d5a16dc508b5abf6cd25 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Mon, 6 Jul 2015 07:35:57 -0700
Subject: Clarify clear-error and flush return value.

* stream.c (stdio_clear_error): Return the prior value of h->err.
Do not inspect feof(h->f) or ferror(h->f); just clear the error
status of the stream.
(stdio_close): Set h->err from errno if fclose failed.
(dir_clear_error): Return prior value of h->err.

* txr.1: Document return value convetion for clear-error,
and flush-stream.
---
 stream.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'stream.c')

diff --git a/stream.c b/stream.c
index 23c2d214..e0bf5bd8 100644
--- a/stream.c
+++ b/stream.c
@@ -486,18 +486,10 @@ static val stdio_get_error_str(val stream)
 static val stdio_clear_error(val stream)
 {
   struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
-  val ret = nil;
-
-  if (h->err) {
-    h->err = nil;
-    ret = t;
-  }
-
-  if (h->f != 0 && (feof(h->f) || ferror(h->f))) {
+  val ret = h->err;
+  if (h->f != 0)
     clearerr(h->f);
-    ret = t;
-  }
-
+  h->err = nil;
   return ret;
 }
 
@@ -614,6 +606,7 @@ static val stdio_close(val stream, val throw_on_error)
     int result = fclose(h->f);
     h->f = 0;
     if (result == EOF && throw_on_error) {
+      h->err = num(errno);
       uw_throwf(file_error_s, lit("error closing ~a: ~a/~s"),
                 stream, num(errno), string_utf8(strerror(errno)), nao);
     }
@@ -1372,11 +1365,9 @@ static val dir_get_error_str(val stream)
 static val dir_clear_error(val stream)
 {
   struct dir_handle *h = coerce(struct dir_handle *, stream->co.handle);
-  if (h->err) {
-    h->err = nil;
-    return t;
-  }
-  return nil;
+  val ret = h->err;
+  h->err = nil;
+  return ret;
 }
 
 static struct strm_ops dir_ops =
-- 
cgit v1.2.3