global: Replace o_stream_send*() with o_stream_nsend*() where return value is ignored

Verified that in all of these places either o_stream_set_no_error_handling()
has been called or o_stream_flush/finish() is called afterwards.

diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 4f953e6e975d0c140f1a256724e63984a55163fc..b9c9826c183d65f520187f82922654f790a4f848 100644 (file)
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -2411,7 +2411,7 @@ void director_connection_deinit(struct director_connection **_conn,
        }
        if (*remote_reason != '\0' &&
            conn->minor_version >= DIRECTOR_VERSION_QUIT) {
-               o_stream_send_str(conn->output, t_strdup_printf(
+               o_stream_nsend_str(conn->output, t_strdup_printf(
                        "QUIT\t%s\n", remote_reason));
        }
 

diff --git a/src/imap-hibernate/imap-hibernate-client.c b/src/imap-hibernate/imap-hibernate-client.c
index fb9be0998aedbd60ceab82a829dbb30595e9772d..df1d509934f0819b0b2ab0fcf91ac08de51c2a26 100644 (file)
--- a/src/imap-hibernate/imap-hibernate-client.c
+++ b/src/imap-hibernate/imap-hibernate-client.c
@@ -169,7 +169,7 @@ imap_hibernate_client_input_args(struct connection *conn,
 
        if (imap_hibernate_client_parse_input(args, pool, &state, &error) < 0) {
                i_error("Failed to parse client input: %s", error);
-               o_stream_send_str(conn->output, t_strdup_printf(
+               o_stream_nsend_str(conn->output, t_strdup_printf(
                        "-Failed to parse client input: %s\n", error));
                return -1;
        }
@@ -220,8 +220,8 @@ imap_hibernate_client_input_line(struct connection *conn, const char *line)
                        ret = -1;
                } else if (line[0] != '\0') {
                        i_error("Expected empty notify fd line from client, but got: %s", line);
-                       o_stream_send_str(conn->output,
-                                         "Expected empty notify fd line");
+                       o_stream_nsend_str(conn->output,
+                                          "Expected empty notify fd line");
                        ret = -1;
                } else {
                        imap_client_add_notify_fd(client->imap_client, fd);
@@ -243,7 +243,7 @@ imap_hibernate_client_input_line(struct connection *conn, const char *line)
                   itself before we have a chance to create another one. */
                client->finished = TRUE;
        }
-       o_stream_send_str(conn->output, "+\n");
+       o_stream_nsend_str(conn->output, "+\n");
        return 1;
 }
 

diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
index 103e3e4865cf71f5fc032a7603afc755970f18dc..6c4abdda8c2d33216294ca36c69af15575beba41 100644 (file)
--- a/src/lib-program-client/test-program-client-net.c
+++ b/src/lib-program-client/test-program-client-net.c
@@ -183,7 +183,7 @@ static void test_program_run(struct test_client *client)
                                                        args[1], args[2]));
                        } else if (strcmp(args[0], "test_program_io") == 0) {
                                os = o_stream_create_dot(client->out, FALSE);
-                               o_stream_send_istream(os, client->body);
+                               o_stream_nsend_istream(os, client->body);
                                test_assert(o_stream_finish(os) > 0);
                                o_stream_unref(&os);
                                o_stream_nsend_str(client->out, "+\n");

diff --git a/src/lib-program-client/test-program-client-unix.c b/src/lib-program-client/test-program-client-unix.c
index f293f459305d0c2467a34073809bad40ff51dbfe..3f4f452ef7311d30b437789c5b7e6c09052a60f7 100644 (file)
--- a/src/lib-program-client/test-program-client-unix.c
+++ b/src/lib-program-client/test-program-client-unix.c
@@ -151,7 +151,7 @@ static void test_program_run(struct test_client *client)
                o_stream_nsend_str(client->out, t_strdup_printf("%s %s\n+\n",
                                   args[1], args[2]));
        } else if (strcmp(args[0], "test_program_io")==0) {
-               o_stream_send_istream(client->out, client->body);
+               o_stream_nsend_istream(client->out, client->body);
                o_stream_nsend_str(client->out, "+\n");
        } else if (strcmp(args[0], "test_program_failure")==0) {
                o_stream_nsend_str(client->out, "-\n");

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index e82b9d67e11fcea4ffdf40da426a58ab87374d20..3b384fa859aaedf8084b191f0f27f89e61ea57cd 100644 (file)
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -1691,7 +1691,7 @@ void smtp_client_connection_disconnect(struct smtp_client_connection *conn)
                !conn->sending_command) {
                /* Close the connection gracefully if possible */
                o_stream_uncork(conn->conn.output);
-               o_stream_send_str(conn->conn.output, "QUIT\r\n");
+               o_stream_nsend_str(conn->conn.output, "QUIT\r\n");
        }
 
        if (conn->dns_lookup != NULL)

diff --git a/src/lib-smtp/test-smtp-client-errors.c b/src/lib-smtp/test-smtp-client-errors.c
index 6622eb3929cf6ad3e286408d48aebc0945b42165..e21a241c08a210fec912d8c8336f114e19ded25e 100644 (file)
--- a/src/lib-smtp/test-smtp-client-errors.c
+++ b/src/lib-smtp/test-smtp-client-errors.c
@@ -481,7 +481,7 @@ test_connection_lost_prematurely_input(struct server_connection *conn)
 static int
 test_connection_lost_prematurely_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Frop/GNU)\r\n");
        return 1;
 }
@@ -671,7 +671,7 @@ test_broken_payload_chunking_input_line(
        struct server_connection *conn, const char *line ATTR_UNUSED)
 {
        if (conn->state == SERVER_CONNECTION_STATE_EHLO) {
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "250-testserver\r\n"
                        "250-PIPELINING\r\n"
                        "250-CHUNKING\r\n"
@@ -1081,9 +1081,9 @@ static int
 test_unexpected_reply_init(struct server_connection *conn)
 {
        if (server_index == 5) {
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "421 testserver Server shutting down for maintenance\r\n");
                sleep(4);
                server_connection_deinit(&conn);
@@ -1099,12 +1099,12 @@ test_unexpected_reply_input_line(struct server_connection *conn,
        switch (conn->state) {
        case SERVER_CONNECTION_STATE_EHLO:
                if (server_index == 4) {
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
                                "250 DSN\r\n");
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "421 testserver Server shutting down for maintenance\r\n");
                        sleep(4);
                        server_connection_deinit(&conn);
@@ -1113,9 +1113,9 @@ test_unexpected_reply_input_line(struct server_connection *conn,
                break;
        case SERVER_CONNECTION_STATE_MAIL_FROM:
                if (server_index == 3) {
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "421 testserver Server shutting down for maintenance\r\n");
                        sleep(4);
                        server_connection_deinit(&conn);
@@ -1124,9 +1124,9 @@ test_unexpected_reply_input_line(struct server_connection *conn,
                break;
        case SERVER_CONNECTION_STATE_RCPT_TO:
                if (server_index == 2) {
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "421 testserver Server shutting down for maintenance\r\n");
                        sleep(4);
                        server_connection_deinit(&conn);
@@ -1135,9 +1135,9 @@ test_unexpected_reply_input_line(struct server_connection *conn,
                break;
        case SERVER_CONNECTION_STATE_DATA:
                if (server_index == 1) {
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "354 End data with <CR><LF>.<CR><LF>\r\n");
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "421 testserver Server shutting down for maintenance\r\n");
                        sleep(4);
                        server_connection_deinit(&conn);
@@ -1417,7 +1417,7 @@ test_partial_reply_input_line(struct server_connection *conn,
 {
        if (conn->state == SERVER_CONNECTION_STATE_EHLO)
                return 0;
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "500 Command not");
        server_connection_deinit(&conn);
        return -1;
@@ -1511,7 +1511,7 @@ test_bad_reply_input_line(struct server_connection *conn,
 {
        if (conn->state == SERVER_CONNECTION_STATE_EHLO)
                return 0;
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "666 Really bad reply\r\n");
        server_connection_deinit(&conn);
        return -1;
@@ -1604,15 +1604,15 @@ test_bad_greeting_init(struct server_connection *conn)
 {
        switch (server_index) {
        case 0:
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "666 Mouhahahaha!!\r\n");
                break;
        case 1:
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "446 Not right now, sorry.\r\n");
                break;
        case 2:
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "233 Gimme all your mail, NOW!!\r\n");
                break;
        }
@@ -2293,7 +2293,7 @@ test_authentication_failed_input_line(struct server_connection *conn,
        switch (conn->state) {
        case SERVER_CONNECTION_STATE_EHLO:
                if (server_index == 1) {
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -2305,7 +2305,7 @@ test_authentication_failed_input_line(struct server_connection *conn,
                break;
        case SERVER_CONNECTION_STATE_MAIL_FROM:
                if (server_index == 1) {
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "535 5.7.8 "
                                "Authentication credentials invalid\r\n");
                        sleep(10);
@@ -2654,7 +2654,7 @@ server_connection_input(struct connection *_conn)
                                return;
                        }
 
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.0.0 Ok: queued as 73BDE342129\r\n");
                        conn->state = SERVER_CONNECTION_STATE_MAIL_FROM;
                        continue;
@@ -2675,7 +2675,7 @@ server_connection_input(struct connection *_conn)
 
                switch (conn->state) {
                case SERVER_CONNECTION_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -2684,22 +2684,22 @@ server_connection_input(struct connection *_conn)
                        return;
                case SERVER_CONNECTION_STATE_MAIL_FROM:
                        if (str_begins(line, "AUTH ")) {
-                               o_stream_send_str(conn->conn.output,
+                               o_stream_nsend_str(conn->conn.output,
                                        "235 2.7.0 "
                                        "Authentication successful\r\n");
                                continue;
                        }
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        conn->state = SERVER_CONNECTION_STATE_RCPT_TO;
                        continue;
                case SERVER_CONNECTION_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        conn->state = SERVER_CONNECTION_STATE_DATA;
                        continue;
                case SERVER_CONNECTION_STATE_DATA:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "354 End data with <CR><LF>.<CR><LF>\r\n");
                        conn->state = SERVER_CONNECTION_STATE_FINISH;
                        continue;
@@ -2731,7 +2731,7 @@ server_connection_init(int fd)
        }
 
        if (test_server_input == NULL) {
-               o_stream_send_str(conn->conn.output,
+               o_stream_nsend_str(conn->conn.output,
                        "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
        }
 }

diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
index 3226d4fb65acc291231ae12716af34887eb53ab9..f3772b06707a1048f07d6529e10cf5be031d4895 100644 (file)
--- a/src/lib-smtp/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -272,7 +272,7 @@ test_bad_greeting_input(struct server_connection *conn)
 static void
 test_bad_greeting_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "554 No SMTP service here.\r\n");
 }
 
@@ -332,7 +332,7 @@ test_denied_helo_input(struct server_connection *conn)
                        server_connection_deinit(&conn);
                return;
        }
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "550 Command rejected for testing reasons\r\n");
        server_connection_deinit(&conn);
 }
@@ -340,7 +340,7 @@ test_denied_helo_input(struct server_connection *conn)
 static void
 test_denied_helo_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -406,7 +406,7 @@ test_disconnect_helo_input(struct server_connection *conn)
 static void
 test_disconnect_helo_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -487,7 +487,7 @@ test_denied_mail_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DENIED_MAIL_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -496,7 +496,7 @@ test_denied_mail_input(struct server_connection *conn)
                        ctx->state = DENIED_MAIL_STATE_MAIL_FROM;
                        return;
                case DENIED_MAIL_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "453 4.3.2 Incapable of accepting messages at this time.\r\n");
                        server_connection_deinit(&conn);
                        return;
@@ -508,7 +508,7 @@ test_denied_mail_input(struct server_connection *conn)
 static void
 test_denied_mail_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -590,7 +590,7 @@ test_denied_rcpt_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DENIED_RCPT_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -599,12 +599,12 @@ test_denied_rcpt_input(struct server_connection *conn)
                        ctx->state = DENIED_RCPT_STATE_MAIL_FROM;
                        return;
                case DENIED_RCPT_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = DENIED_RCPT_STATE_RCPT_TO;
                        continue;
                case DENIED_RCPT_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "550 5.4.3 Directory server failure\r\n");
                        server_connection_deinit(&conn);
                        return;
@@ -616,7 +616,7 @@ test_denied_rcpt_input(struct server_connection *conn)
 static void
 test_denied_rcpt_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -699,7 +699,7 @@ test_denied_second_rcpt_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DENIED_SECOND_RCPT_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -708,17 +708,17 @@ test_denied_second_rcpt_input(struct server_connection *conn)
                        ctx->state = DENIED_SECOND_RCPT_STATE_MAIL_FROM;
                        return;
                case DENIED_SECOND_RCPT_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = DENIED_SECOND_RCPT_STATE_RCPT_TO;
                        continue;
                case DENIED_SECOND_RCPT_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        ctx->state = DENIED_SECOND_RCPT_STATE_RCPT_TO2;
                        continue;
                case DENIED_SECOND_RCPT_STATE_RCPT_TO2:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "550 5.4.3 Directory server failure\r\n");
                        server_connection_deinit(&conn);
                        return;
@@ -730,7 +730,7 @@ test_denied_second_rcpt_input(struct server_connection *conn)
 static void
 test_denied_second_rcpt_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -765,7 +765,7 @@ test_client_denied_second_rcpt(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit,
                SMTP_ADDRESS_LITERAL("rcpt2", "example.com"));
        output = smtp_submit_send(smtp_submit);
-       o_stream_send_str(output, test_message1);
+       o_stream_nsend_str(output, test_message1);
 
        ret = smtp_submit_run(smtp_submit, &error);
        test_out_reason("run (ret == 0)", ret == 0, error);
@@ -831,7 +831,7 @@ test_denied_data_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DENIED_DATA_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -840,17 +840,17 @@ test_denied_data_input(struct server_connection *conn)
                        ctx->state = DENIED_DATA_STATE_MAIL_FROM;
                        return;
                case DENIED_DATA_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = DENIED_DATA_STATE_RCPT_TO;
                        continue;
                case DENIED_DATA_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        ctx->state = DENIED_DATA_STATE_DATA;
                        continue;
                case DENIED_DATA_STATE_DATA:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "500 5.0.0 Unacceptabe recipients\r\n");
                        server_connection_deinit(&conn);
                        return;
@@ -862,7 +862,7 @@ test_denied_data_input(struct server_connection *conn)
 static void
 test_denied_data_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -946,7 +946,7 @@ test_data_failure_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DATA_FAILURE_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -955,23 +955,23 @@ test_data_failure_input(struct server_connection *conn)
                        ctx->state = DATA_FAILURE_STATE_MAIL_FROM;
                        return;
                case DATA_FAILURE_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = DATA_FAILURE_STATE_RCPT_TO;
                        continue;
                case DATA_FAILURE_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        ctx->state = DATA_FAILURE_STATE_DATA;
                        continue;
                case DATA_FAILURE_STATE_DATA:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "354 End data with <CR><LF>.<CR><LF>\r\n");
                        ctx->state = DATA_FAILURE_STATE_FINISH;
                        continue;
                case DATA_FAILURE_STATE_FINISH:
                        if (strcmp(line, ".") == 0) {
-                               o_stream_send_str(conn->conn.output,
+                               o_stream_nsend_str(conn->conn.output,
                                        "552 5.2.3 Message length exceeds administrative limit\r\n");
                                server_connection_deinit(&conn);
                                return;
@@ -985,7 +985,7 @@ test_data_failure_input(struct server_connection *conn)
 static void
 test_data_failure_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -1069,7 +1069,7 @@ test_data_disconnect_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DATA_DISCONNECT_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -1078,17 +1078,17 @@ test_data_disconnect_input(struct server_connection *conn)
                        ctx->state = DATA_DISCONNECT_STATE_MAIL_FROM;
                        return;
                case DATA_DISCONNECT_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = DATA_DISCONNECT_STATE_RCPT_TO;
                        continue;
                case DATA_DISCONNECT_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        ctx->state = DATA_DISCONNECT_STATE_DATA;
                        continue;
                case DATA_DISCONNECT_STATE_DATA:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "354 End data with <CR><LF>.<CR><LF>\r\n");
                        ctx->state = DATA_DISCONNECT_STATE_FINISH;
                        continue;
@@ -1103,7 +1103,7 @@ test_data_disconnect_input(struct server_connection *conn)
 static void
 test_data_disconnect_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -1187,7 +1187,7 @@ test_data_timout_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case DATA_TIMEOUT_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -1196,17 +1196,17 @@ test_data_timout_input(struct server_connection *conn)
                        ctx->state = DATA_TIMEOUT_STATE_MAIL_FROM;
                        return;
                case DATA_TIMEOUT_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = DATA_TIMEOUT_STATE_RCPT_TO;
                        continue;
                case DATA_TIMEOUT_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        ctx->state = DATA_TIMEOUT_STATE_DATA;
                        continue;
                case DATA_TIMEOUT_STATE_DATA:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "354 End data with <CR><LF>.<CR><LF>\r\n");
                        ctx->state = DATA_TIMEOUT_STATE_FINISH;
                        continue;
@@ -1222,7 +1222,7 @@ test_data_timout_input(struct server_connection *conn)
 static void
 test_data_timout_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -1345,7 +1345,7 @@ test_successful_delivery_input(struct server_connection *conn)
                                return;
                        }
 
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.0.0 Ok: queued as 73BDE342129\r\n");
                        ctx->state = SUCCESSFUL_DELIVERY_STATE_MAIL_FROM;
                        continue;
@@ -1360,7 +1360,7 @@ test_successful_delivery_input(struct server_connection *conn)
 
                switch (ctx->state) {
                case SUCCESSFUL_DELIVERY_STATE_EHLO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250-testserver\r\n"
                                "250-PIPELINING\r\n"
                                "250-ENHANCEDSTATUSCODES\r\n"
@@ -1369,17 +1369,17 @@ test_successful_delivery_input(struct server_connection *conn)
                        ctx->state = SUCCESSFUL_DELIVERY_STATE_MAIL_FROM;
                        return;
                case SUCCESSFUL_DELIVERY_STATE_MAIL_FROM:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.0 Ok\r\n");
                        ctx->state = SUCCESSFUL_DELIVERY_STATE_RCPT_TO;
                        continue;
                case SUCCESSFUL_DELIVERY_STATE_RCPT_TO:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "250 2.1.5 Ok\r\n");
                        ctx->state = SUCCESSFUL_DELIVERY_STATE_DATA;
                        continue;
                case SUCCESSFUL_DELIVERY_STATE_DATA:
-                       o_stream_send_str(conn->conn.output,
+                       o_stream_nsend_str(conn->conn.output,
                                "354 End data with <CR><LF>.<CR><LF>\r\n");
                        ctx->state = SUCCESSFUL_DELIVERY_STATE_FINISH;
                        continue;
@@ -1393,7 +1393,7 @@ test_successful_delivery_input(struct server_connection *conn)
 static void
 test_successful_delivery_init(struct server_connection *conn)
 {
-       o_stream_send_str(conn->conn.output,
+       o_stream_nsend_str(conn->conn.output,
                "220 testserver ESMTP Testfix (Debian/GNU)\r\n");
 }
 
@@ -1476,7 +1476,7 @@ test_client_parallel_delivery(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit1,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit1);
-       o_stream_send_str(output, test_message1);
+       o_stream_nsend_str(output, test_message1);
 
        smtp_submit_run_async(smtp_submit1,
                test_client_parallel_delivery_callback, ctx);
@@ -1490,7 +1490,7 @@ test_client_parallel_delivery(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit2,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit2);
-       o_stream_send_str(output, test_message2);
+       o_stream_nsend_str(output, test_message2);
 
        smtp_submit_run_async(smtp_submit2,
                test_client_parallel_delivery_callback, ctx);
@@ -1564,7 +1564,7 @@ test_client_failed_sendmail(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit);
-       o_stream_send_str(output, test_message1);
+       o_stream_nsend_str(output, test_message1);
 
        ret = smtp_submit_run(smtp_submit, &error);
        test_out_reason("run (ret < 0)", ret < 0, error);
@@ -1619,7 +1619,7 @@ test_client_successful_sendmail(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit);
-       o_stream_send_str(output, test_message1);
+       o_stream_nsend_str(output, test_message1);
 
        ret = smtp_submit_run(smtp_submit, &error);
        test_out_reason("run (ret > 0)", ret > 0, error);
@@ -1703,7 +1703,7 @@ test_client_parallel_sendmail(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit1,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit1);
-       o_stream_send_str(output, test_message1);
+       o_stream_nsend_str(output, test_message1);
 
        smtp_submit_run_async(smtp_submit1,
                test_client_parallel_sendmail_callback, ctx);
@@ -1716,7 +1716,7 @@ test_client_parallel_sendmail(const struct smtp_submit_settings *submit_set)
        smtp_submit_add_rcpt(smtp_submit2,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit2);
-       o_stream_send_str(output, test_message2);
+       o_stream_nsend_str(output, test_message2);
 
        smtp_submit_run_async(smtp_submit2,
                test_client_parallel_sendmail_callback, ctx);
@@ -1814,7 +1814,7 @@ test_client_smtp_send_simple(const struct smtp_submit_settings *smtp_set,
        smtp_submit_add_rcpt(smtp_submit,
                SMTP_ADDRESS_LITERAL("rcpt", "example.com"));
        output = smtp_submit_send(smtp_submit);
-       o_stream_send_str(output, message);
+       o_stream_nsend_str(output, message);
 
        ret = smtp_submit_run(smtp_submit, error_r);
 

diff --git a/src/lib-storage/list/subscription-file.c b/src/lib-storage/list/subscription-file.c
index 8096d3a1269d13fd1ffd284c64d808e50d082458..4c5094a40ca490f4eafe84d59e23284bc4709fcd 100644 (file)
--- a/src/lib-storage/list/subscription-file.c
+++ b/src/lib-storage/list/subscription-file.c
@@ -188,7 +188,7 @@ int subsfile_set_subscribed(struct mailbox_list *list, const char *path,
        output = o_stream_create_fd_file(fd_out, 0, FALSE);
        o_stream_cork(output);
        if (version >= 2)
-               o_stream_send_str(output, version2_header);
+               o_stream_nsend_str(output, version2_header);
        if (version < 2 || name[0] == '\0')
                escaped_name = name;
        else {

diff --git a/src/master/master-client.c b/src/master/master-client.c
index 5525ee09ba370904a083a4d7e75a819c75df3774..71880a763f2cc99717b9fe1ceca34477b3aa0c7f 100644 (file)
--- a/src/master/master-client.c
+++ b/src/master/master-client.c
@@ -97,7 +97,7 @@ master_client_stop(struct master_client *client, const char *const *args)
                        service->doveadm_stop = TRUE;
                }
        }
-       o_stream_send_str(client->conn.output, reply);
+       o_stream_nsend_str(client->conn.output, reply);
        return 1;
 }
 

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 330272381b889643847e6a8c18ffb2f484703d96..c88586d55863b5517728de8eac63752fccbf6900 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -91,7 +91,7 @@ static void client_handle_request(struct quota_client *client)
        int ret;
 
        if (client->recipient == NULL) {
-               o_stream_send_str(client->conn.output, "action=DUNNO\n\n");
+               o_stream_nsend_str(client->conn.output, "action=DUNNO\n\n");
                return;
        }
 
@@ -142,11 +142,11 @@ static void client_handle_request(struct quota_client *client)
 
        if (ret < 0) {
                /* temporary failure */
-               o_stream_send_str(client->conn.output, t_strdup_printf(
+               o_stream_nsend_str(client->conn.output, t_strdup_printf(
                        "action=DEFER_IF_PERMIT %s\n\n", error));
        } else {
-               o_stream_send_str(client->conn.output,
-                                 t_strdup_printf("action=%s\n\n", value));
+               o_stream_nsend_str(client->conn.output,
+                                  t_strdup_printf("action=%s\n\n", value));
        }
 }