global: Avoid i_stream_is_eof() where it's not necessary

diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c
index 6767ba3d95120a1f3a87a00ce371283290e5c034..4737383ef9e2457857a5fe3701c6d835c2dfbeac 100644 (file)
--- a/src/lib-http/test-http-server-errors.c
+++ b/src/lib-http/test-http-server-errors.c
@@ -258,7 +258,7 @@ test_server_hanging_request_payload_input(struct _hanging_request_payload *ctx)
                return;
        }
 
-       i_assert(i_stream_is_eof(ctx->payload_input));
+       i_assert(ctx->payload_input->eof);
                
        resp = http_server_response_create(req, 200, "OK");
        http_server_response_submit(resp);

diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
index c94782aaa730ed77fabae12c7348e2bc4c7c43a6..8b360770946f8396521cfbbcb9e4463649f000fe 100644 (file)
--- a/src/lib-smtp/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -328,8 +328,7 @@ test_denied_helo_input(struct server_connection *conn)
 
        line = i_stream_read_next_line(conn->conn.input);
        if (line == NULL) {
-               if (i_stream_is_eof(conn->conn.input) ||
-                       conn->conn.input->stream_errno != 0)
+               if (conn->conn.input->eof)
                        server_connection_deinit(&conn);
                return;
        }
@@ -399,8 +398,7 @@ test_disconnect_helo_input(struct server_connection *conn)
 
        line = i_stream_read_next_line(conn->conn.input);
        if (line == NULL) {
-               if (i_stream_is_eof(conn->conn.input) ||
-                       conn->conn.input->stream_errno != 0)
+               if (conn->conn.input->eof)
                        server_connection_deinit(&conn);
                return;
        }
@@ -486,8 +484,7 @@ test_denied_mail_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -592,8 +589,7 @@ test_denied_rcpt_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -702,8 +698,7 @@ test_denied_second_rcpt_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -832,8 +827,7 @@ test_denied_data_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -948,8 +942,7 @@ test_data_failure_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -1072,8 +1065,7 @@ test_data_disconnect_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -1191,8 +1183,7 @@ test_data_timout_input(struct server_connection *conn)
        for (;;) {
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -1364,8 +1355,7 @@ test_successful_delivery_input(struct server_connection *conn)
 
                line = i_stream_read_next_line(conn->conn.input);
                if (line == NULL) {
-                       if (i_stream_is_eof(conn->conn.input) ||
-                               conn->conn.input->stream_errno != 0)
+                       if (conn->conn.input->eof)
                                server_connection_deinit(&conn);
                        return;
                }
@@ -2023,7 +2013,7 @@ test_message_delivery(const char *message, const char *file)
 
        test_out_reason("delivery", ret < 0 &&
                input->stream_errno == 0 &&
-               i_stream_is_eof(input) &&
+               input->eof &&
                input->v_offset == (uoff_t)msize,
                (input->stream_errno == 0 ? NULL : i_stream_get_error(input)));
        i_stream_unref(&input);

diff --git a/src/lib/test-istream-chain.c b/src/lib/test-istream-chain.c
index bb1b54db1bc0865dcd238ae7ec0df5123a0206db..308ece6a7ad38689b311d103c32bc42d8733faac 100644 (file)
--- a/src/lib/test-istream-chain.c
+++ b/src/lib/test-istream-chain.c
@@ -44,8 +44,8 @@ static void test_istream_chain_basic(void)
 
        i_stream_unref(&input);
 
-       test_assert(i_stream_is_eof(test_input));
-       test_assert(i_stream_is_eof(test_input2));
+       test_assert(test_input->eof && test_input->stream_errno == 0);
+       test_assert(test_input2->eof && test_input2->stream_errno == 0);
 
        i_stream_unref(&test_input);
        i_stream_unref(&test_input2);

diff --git a/src/lib/test-istream-concat.c b/src/lib/test-istream-concat.c
index 0248a377bc3b143f6aadcdbd9b2322d682a83345..367854a440380ac00b57d84be7b275637d30e7bc 100644 (file)
--- a/src/lib/test-istream-concat.c
+++ b/src/lib/test-istream-concat.c
@@ -50,7 +50,7 @@ static void test_istream_concat_one(unsigned int buffer_size)
        i_stream_unref(&input);
 
        for (i = 0; i < STREAM_COUNT; i++) {
-               test_assert(i_stream_is_eof(streams[i]));
+               test_assert(streams[i]->eof && streams[i]->stream_errno == 0);
                i_stream_unref(&streams[i]);
        }
 }

diff --git a/src/lib/test-istream-seekable.c b/src/lib/test-istream-seekable.c
index 27632a867cced038d43ee4c6b9f192cbf6e0d885..9bcb650212c462932a272057aac95afb722c540a 100644 (file)
--- a/src/lib/test-istream-seekable.c
+++ b/src/lib/test-istream-seekable.c
@@ -59,7 +59,7 @@ static void test_istream_seekable_one(unsigned int buffer_size)
        }
        test_assert(i_stream_read(input) == -1);
        for (i = 0; i < STREAM_COUNT; i++) {
-               test_assert(i_stream_is_eof(streams[i]));
+               test_assert(streams[i]->eof && streams[i]->stream_errno == 0);
                i_stream_unref(&streams[i]);
        }
        i_stream_unref(&input);
@@ -120,7 +120,7 @@ static void test_istream_seekable_random(void)
                size = i_stream_get_data_size(input);
        }
        for (i = 0; i < stream_count; i++) {
-               test_assert(i_stream_is_eof(streams[i]));
+               test_assert(streams[i]->eof && streams[i]->stream_errno == 0);
                i_stream_unref(&streams[i]);
        }
        i_stream_unref(&input);