Changeset: 58dd393e4898 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/58dd393e4898
Branch: Sep2022
Log Message:
Merge branch 'Jan2022' into 'Sep2022'
diffs (32 lines):
diff --git a/common/stream/iconv_stream.c b/common/stream/iconv_stream.c
--- a/common/stream/iconv_stream.c
+++ b/common/stream/iconv_stream.c
@@ -90,8 +90,7 @@ ic_write(stream *restrict s, const void
/* not enough space in output buffer */
break;
default:
- /* cannot happen (according to manual) */
- mnstr_set_error(s, MNSTR_WRITE_ERROR, "iconv
internal error %d", errno);
+ mnstr_set_error_errno(s, MNSTR_WRITE_ERROR,
"iconv reported an error");
goto bailout;
}
}
@@ -153,7 +152,7 @@ ic_read(stream *restrict s, void *restri
}
if (iconv(ic->cd, NULL, NULL, &outbuf, &outbytesleft)
== (size_t) -1) {
/* some error occurred */
- mnstr_set_error(s, MNSTR_READ_ERROR,
"unspecified iconv error occurred");
+ mnstr_set_error_errno(s, MNSTR_READ_ERROR,
"iconv reported an error");
return -1;
}
goto exit_func; /* double break */
@@ -176,8 +175,7 @@ ic_read(stream *restrict s, void *restri
* the buffer */
goto exit_func;
default:
- /* cannot happen (according to manual) */
- mnstr_set_error(s, MNSTR_READ_ERROR, "inconv
stream: internal error");
+ mnstr_set_error_errno(s, MNSTR_READ_ERROR,
"iconv reported an error");
return -1;
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
