From: Timo Sirainen Date: Wed, 23 May 2018 11:38:05 +0000 (+0300) Subject: global: Replace (void)o_stream_send*() with o_stream_nsend*() X-Git-Tag: 2.3.9~1603 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b84bc3aa2bb6676e770d6e58ba800a3ee461417f;p=thirdparty%2Fdovecot%2Fcore.git global: Replace (void)o_stream_send*() with o_stream_nsend*() --- diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c index 9a3c9dd63d..d878231113 100644 --- a/src/auth/auth-master-connection.c +++ b/src/auth/auth-master-connection.c @@ -176,7 +176,7 @@ master_input_cache_flush(struct auth_master_connection *conn, const char *args) } else { count = auth_cache_clear_users(passdb_cache, list+1); } - (void)o_stream_send_str(conn->output, + o_stream_nsend_str(conn->output, t_strdup_printf("OK\t%s\t%u\n", list[0], count)); return TRUE; } diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c index fa57f52c23..16e45543ac 100644 --- a/src/lib-http/http-transfer-chunked.c +++ b/src/lib-http/http-transfer-chunked.c @@ -565,7 +565,7 @@ http_transfer_chunked_ostream_close(struct iostream_private *stream, struct http_transfer_chunked_ostream *tcstream = (struct http_transfer_chunked_ostream *)stream; - (void)o_stream_send(tcstream->ostream.parent, "0\r\n\r\n", 5); + o_stream_nsend(tcstream->ostream.parent, "0\r\n\r\n", 5); (void)o_stream_flush(&tcstream->ostream.ostream); if (close_parent) o_stream_close(tcstream->ostream.parent); diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c index 0771a0a8c5..b184c72d14 100644 --- a/src/lib-http/test-http-server-errors.c +++ b/src/lib-http/test-http-server-errors.c @@ -94,7 +94,7 @@ test_slow_request_input(struct client_connection *conn ATTR_UNUSED) static void test_slow_request_connected(struct client_connection *conn) { - (void)o_stream_send_str(conn->conn.output, + o_stream_nsend_str(conn->conn.output, "GET / HTTP/1.1\r\n" "Host: example.com\r\n" "\r\n"); @@ -194,7 +194,7 @@ static void test_slow_request(void) static void test_hanging_request_payload_connected(struct client_connection *conn) { - (void)o_stream_send_str(conn->conn.output, + o_stream_nsend_str(conn->conn.output, "GET / HTTP/1.1\r\n" "Host: example.com\r\n" "Content-Length: 1000\r\n" @@ -329,7 +329,7 @@ static void test_hanging_request_payload(void) static void test_hanging_response_payload_connected(struct client_connection *conn) { - (void)o_stream_send_str(conn->conn.output, + o_stream_nsend_str(conn->conn.output, "GET / HTTP/1.1\r\n" "Host: example.com\r\n" "Content-Length: 18\r\n" @@ -432,7 +432,7 @@ static void test_hanging_response_payload(void) static void test_excessive_payload_length_connected1(struct client_connection *conn) { - (void)o_stream_send_str(conn->conn.output, + o_stream_nsend_str(conn->conn.output, "GET / HTTP/1.1\r\n" "Host: example.com\r\n" "Content-Length: 150\r\n" @@ -452,7 +452,7 @@ test_client_excessive_payload_length1(unsigned int index) static void test_excessive_payload_length_connected2(struct client_connection *conn) { - (void)o_stream_send_str(conn->conn.output, + o_stream_nsend_str(conn->conn.output, "GET / HTTP/1.1\r\n" "Host: example.com\r\n" "Transfer-Encoding: chunked\r\n" diff --git a/src/lib-http/test-http-transfer.c b/src/lib-http/test-http-transfer.c index 6cb3485de1..88c428bda5 100644 --- a/src/lib-http/test-http-transfer.c +++ b/src/lib-http/test-http-transfer.c @@ -200,7 +200,7 @@ static void test_http_transfer_chunked_input_invalid(void) buffer_set_used_size(payload_buffer, 0); output = o_stream_create_buffer(payload_buffer); - (void)o_stream_send_istream(output, chunked); + o_stream_nsend_istream(output, chunked); test_out("payload read failure", chunked->stream_errno != 0); i_stream_unref(&chunked); o_stream_destroy(&output); diff --git a/src/lib-storage/index/dbox-common/dbox-file-fix.c b/src/lib-storage/index/dbox-common/dbox-file-fix.c index 1178387679..af96dd1656 100644 --- a/src/lib-storage/index/dbox-common/dbox-file-fix.c +++ b/src/lib-storage/index/dbox-common/dbox-file-fix.c @@ -236,7 +236,7 @@ stream_copy(struct dbox_file *file, struct ostream *output, int ret = 0; input = i_stream_create_limit(file->input, count); - (void)o_stream_send_istream(output, input); + o_stream_nsend_istream(output, input); if (input->stream_errno != 0) { mail_storage_set_critical(&file->storage->storage, diff --git a/src/lib-storage/index/mbox/mbox-sync-rewrite.c b/src/lib-storage/index/mbox/mbox-sync-rewrite.c index 37aaf2c3f4..cc34960064 100644 --- a/src/lib-storage/index/mbox/mbox-sync-rewrite.c +++ b/src/lib-storage/index/mbox/mbox-sync-rewrite.c @@ -40,7 +40,7 @@ int mbox_move(struct mbox_sync_context *sync_ctx, /* we're moving data within a file. it really shouldn't be failing at this point or we're corrupted. */ input = i_stream_create_limit(sync_ctx->file_input, size); - (void)o_stream_send_istream(output, input); + o_stream_nsend_istream(output, input); if (input->stream_errno != 0) { mailbox_set_critical(&mbox->box, "read() failed with mbox: %s",