lib: istream - Simplify i_stream_read_data() EOF and error handling

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 073662fdd60c7613159855e1a12c9e55d3a5b7d4..168456f01f65b4488d8a3bd4f62b612c465b55ef 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -797,13 +797,9 @@ int i_stream_read_data(struct istream *stream, const unsigned char **data_r,
                i_assert(!stream->blocking);
                return 0;
        }
-       if (stream->eof) {
-               if (read_more) {
-                       /* we read at least some new data */
-                       return 0;
-               }
-       } else {
-               i_assert(stream->stream_errno != 0);
+       if (stream->stream_errno == 0 && read_more) {
+               /* we read at least some new data */
+               return 0;
        }
        return -1;
 }