summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2020-04-13 23:36:04 -0700
committerKaz Kylheku <kaz@kylheku.com>2020-04-13 23:36:04 -0700
commit89fec3500c98572f1439aa7010100ef2c1214095 (patch)
tree42a0adb9efb64d1c30ed6afaf7ff18184858437e
parent155390d6bbd514fe318b2fafc64f75762a73fab3 (diff)
downloadtxr-89fec3500c98572f1439aa7010100ef2c1214095.tar.gz
txr-89fec3500c98572f1439aa7010100ef2c1214095.tar.bz2
txr-89fec3500c98572f1439aa7010100ef2c1214095.zip
streams: fix reversed order of items in error diagnostic.
* stream.c (stdio_maybe_error): We want to say "error whatever-ing #<stream ....>": the action has to come first, and from the format specifiers being ~a ~s, that was clearly the intent.
-rw-r--r--stream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stream.c b/stream.c
index bd8d463e..8856d9b8 100644
--- a/stream.c
+++ b/stream.c
@@ -573,14 +573,14 @@ static val stdio_maybe_error(val stream, val action)
struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
val err = num(errno);
if (h->f == 0)
- uw_throwf(file_error_s, lit("error ~a ~s: file closed"), stream, action, nao);
+ uw_throwf(file_error_s, lit("error ~a ~s: file closed"), action, stream, nao);
h->err = err;
#ifdef EAGAIN
if (errno == EAGAIN)
uw_throwf(timeout_error_s, lit("timed out on ~s"), stream, nao);
#endif
uw_throwf(file_error_s, lit("error ~a ~s: ~d/~s"),
- stream, action, err, errno_to_string(err), nao);
+ action, stream, err, errno_to_string(err), nao);
}
static int se_putc(int ch, FILE *f)