From: Timo Sirainen Date: Fri, 27 Oct 2017 18:08:26 +0000 (+0300) Subject: global: Add flags parameter to i_stream_create() and set it to 0 X-Git-Tag: 2.3.0.rc1~637 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2974dca6be5120e49279f06c8aa952e5fac56048;p=thirdparty%2Fdovecot%2Fcore.git global: Add flags parameter to i_stream_create() and set it to 0 This just changes the API - the following changes add the new flag. --- diff --git a/src/lib-compression/istream-bzlib.c b/src/lib-compression/istream-bzlib.c index fd0f2ffaa5..199bdecf6a 100644 --- a/src/lib-compression/istream-bzlib.c +++ b/src/lib-compression/istream-bzlib.c @@ -326,6 +326,6 @@ struct istream *i_stream_create_bz2(struct istream *input, bool log_errors) zstream->istream.istream.seekable = input->seekable; return i_stream_create(&zstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } #endif diff --git a/src/lib-compression/istream-lz4.c b/src/lib-compression/istream-lz4.c index 71ced39b6c..8ba3d2a2d6 100644 --- a/src/lib-compression/istream-lz4.c +++ b/src/lib-compression/istream-lz4.c @@ -307,6 +307,6 @@ struct istream *i_stream_create_lz4(struct istream *input, bool log_errors) zstream->chunk_buf = buffer_create_dynamic(default_pool, 1024); return i_stream_create(&zstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } #endif diff --git a/src/lib-compression/istream-lzma.c b/src/lib-compression/istream-lzma.c index 9231c73c5b..7671a21d6c 100644 --- a/src/lib-compression/istream-lzma.c +++ b/src/lib-compression/istream-lzma.c @@ -335,6 +335,6 @@ struct istream *i_stream_create_lzma(struct istream *input, bool log_errors) zstream->istream.istream.seekable = input->seekable; return i_stream_create(&zstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } #endif diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c index 51bbde12ce..4905424fe8 100644 --- a/src/lib-compression/istream-zlib.c +++ b/src/lib-compression/istream-zlib.c @@ -500,7 +500,7 @@ i_stream_create_zlib(struct istream *input, bool gz, bool log_errors) zstream->istream.istream.seekable = input->seekable; return i_stream_create(&zstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } struct istream *i_stream_create_gz(struct istream *input, bool log_errors) diff --git a/src/lib-dcrypt/istream-decrypt.c b/src/lib-dcrypt/istream-decrypt.c index 35c640b7bd..e134551f5f 100644 --- a/src/lib-dcrypt/istream-decrypt.c +++ b/src/lib-dcrypt/istream-decrypt.c @@ -867,7 +867,7 @@ struct decrypt_istream *i_stream_create_decrypt_common(struct istream *input) dstream->buf = buffer_create_dynamic(default_pool, 512); (void)i_stream_create(&dstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); return dstream; } diff --git a/src/lib-fs/istream-fs-file.c b/src/lib-fs/istream-fs-file.c index ab1ff03bc2..fc266c8a51 100644 --- a/src/lib-fs/istream-fs-file.c +++ b/src/lib-fs/istream-fs-file.c @@ -54,7 +54,7 @@ i_stream_create_fs_file(struct fs_file **file, size_t max_buffer_size) fstream->istream.istream.seekable = ((*file)->flags & FS_OPEN_FLAG_SEEKABLE) != 0; - input = i_stream_create(&fstream->istream, NULL, -1); + input = i_stream_create(&fstream->istream, NULL, -1, 0); i_stream_set_name(input, fs_file_path(*file)); *file = NULL; return input; diff --git a/src/lib-fs/istream-fs-stats.c b/src/lib-fs/istream-fs-stats.c index e9cc75cbc7..30a608e8b4 100644 --- a/src/lib-fs/istream-fs-stats.c +++ b/src/lib-fs/istream-fs-stats.c @@ -43,5 +43,5 @@ i_stream_create_fs_stats(struct istream *input, struct fs_file *file) sstream->istream.istream.blocking = input->blocking; sstream->istream.istream.seekable = input->seekable; return i_stream_create(&sstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-fs/istream-metawrap.c b/src/lib-fs/istream-metawrap.c index 2fb1a9b652..890d19fe2e 100644 --- a/src/lib-fs/istream-metawrap.c +++ b/src/lib-fs/istream-metawrap.c @@ -148,5 +148,5 @@ i_stream_create_metawrap(struct istream *input, mstream->callback = callback; mstream->context = context; return i_stream_create(&mstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c index 6cde504a54..3bf282ecaa 100644 --- a/src/lib-http/http-server-request.c +++ b/src/lib-http/http-server-request.c @@ -589,7 +589,7 @@ http_server_request_get_payload_input(struct http_server_request *req, hsristream->istream.istream.seekable = FALSE; req->payload_input = i_stream_create - (&hsristream->istream, payload, i_stream_get_fd(payload)); + (&hsristream->istream, payload, i_stream_get_fd(payload), 0); i_stream_unref(&req->req.payload); return req->payload_input; } diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c index 46c6de860e..faa75212b2 100644 --- a/src/lib-http/http-transfer-chunked.c +++ b/src/lib-http/http-transfer-chunked.c @@ -515,7 +515,7 @@ http_transfer_chunked_istream_create(struct istream *input, uoff_t max_size) tcstream->istream.istream.readable_fd = FALSE; tcstream->istream.istream.blocking = input->blocking; tcstream->istream.istream.seekable = FALSE; - return i_stream_create(&tcstream->istream, input, i_stream_get_fd(input)); + return i_stream_create(&tcstream->istream, input, i_stream_get_fd(input), 0); } /* diff --git a/src/lib-mail/istream-attachment-extractor.c b/src/lib-mail/istream-attachment-extractor.c index 8420548aeb..0670ca7df4 100644 --- a/src/lib-mail/istream-attachment-extractor.c +++ b/src/lib-mail/istream-attachment-extractor.c @@ -718,7 +718,7 @@ i_stream_create_attachment_extractor(struct istream *input, MESSAGE_PARSER_FLAG_INCLUDE_MULTIPART_BLOCKS | MESSAGE_PARSER_FLAG_INCLUDE_BOUNDARIES); return i_stream_create(&astream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } bool i_stream_attachment_extractor_can_retry(struct istream *input) diff --git a/src/lib-mail/istream-binary-converter.c b/src/lib-mail/istream-binary-converter.c index fe8e05d4ef..a89ebc7ee1 100644 --- a/src/lib-mail/istream-binary-converter.c +++ b/src/lib-mail/istream-binary-converter.c @@ -301,5 +301,5 @@ struct istream *i_stream_create_binary_converter(struct istream *input) MESSAGE_PARSER_FLAG_INCLUDE_MULTIPART_BLOCKS | MESSAGE_PARSER_FLAG_INCLUDE_BOUNDARIES); return i_stream_create(&bstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-mail/istream-dot.c b/src/lib-mail/istream-dot.c index da15dd14f9..36514a9a4b 100644 --- a/src/lib-mail/istream-dot.c +++ b/src/lib-mail/istream-dot.c @@ -231,5 +231,5 @@ struct istream *i_stream_create_dot(struct istream *input, bool send_last_lf) dstream->state_no_cr = TRUE; dstream->state_no_lf = TRUE; return i_stream_create(&dstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-mail/istream-header-filter.c b/src/lib-mail/istream-header-filter.c index 5d209d48c8..d9c483afd1 100644 --- a/src/lib-mail/istream-header-filter.c +++ b/src/lib-mail/istream-header-filter.c @@ -675,7 +675,7 @@ i_stream_create_header_filter(struct istream *input, mstream->istream.istream.blocking = input->blocking; mstream->istream.istream.seekable = input->seekable; - return i_stream_create(&mstream->istream, input, -1); + return i_stream_create(&mstream->istream, input, -1, 0); } void i_stream_header_filter_add(struct header_filter_istream *input, diff --git a/src/lib-mail/istream-nonuls.c b/src/lib-mail/istream-nonuls.c index 3559100394..04ffd9cd8f 100644 --- a/src/lib-mail/istream-nonuls.c +++ b/src/lib-mail/istream-nonuls.c @@ -75,5 +75,5 @@ struct istream *i_stream_create_nonuls(struct istream *input, char replace_chr) nstream->istream.istream.seekable = FALSE; nstream->replace_chr = replace_chr; return i_stream_create(&nstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-mail/istream-qp-decoder.c b/src/lib-mail/istream-qp-decoder.c index cc86654ee7..3d1f4c9831 100644 --- a/src/lib-mail/istream-qp-decoder.c +++ b/src/lib-mail/istream-qp-decoder.c @@ -136,5 +136,5 @@ struct istream *i_stream_create_qp_decoder(struct istream *input) bstream->istream.istream.blocking = input->blocking; bstream->istream.istream.seekable = input->seekable; return i_stream_create(&bstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-mail/istream-qp-encoder.c b/src/lib-mail/istream-qp-encoder.c index 19eb0a765d..48b87dabc6 100644 --- a/src/lib-mail/istream-qp-encoder.c +++ b/src/lib-mail/istream-qp-encoder.c @@ -123,5 +123,5 @@ struct istream *i_stream_create_qp_encoder(struct istream *input, bstream->istream.istream.blocking = input->blocking; bstream->istream.istream.seekable = input->seekable; return i_stream_create(&bstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-program-client/program-client-remote.c b/src/lib-program-client/program-client-remote.c index 2f986c369f..bb1591195e 100644 --- a/src/lib-program-client/program-client-remote.c +++ b/src/lib-program-client/program-client-remote.c @@ -186,7 +186,7 @@ struct istream *program_client_istream_create(struct program_client *program_cli i_stream_seek(input, 0); - return i_stream_create(&scstream->istream, input, -1); + return i_stream_create(&scstream->istream, input, -1, 0); } /* diff --git a/src/lib-ssl-iostream/istream-openssl.c b/src/lib-ssl-iostream/istream-openssl.c index 4fb24755a5..4b810adb24 100644 --- a/src/lib-ssl-iostream/istream-openssl.c +++ b/src/lib-ssl-iostream/istream-openssl.c @@ -118,5 +118,5 @@ struct istream *openssl_i_stream_create_ssl(struct ssl_iostream *ssl_io) sstream->istream.istream.readable_fd = FALSE; return i_stream_create(&sstream->istream, NULL, - i_stream_get_fd(ssl_io->plain_input)); + i_stream_get_fd(ssl_io->plain_input), 0); } diff --git a/src/lib-storage/index/istream-mail.c b/src/lib-storage/index/istream-mail.c index bc57500150..44d6fdf025 100644 --- a/src/lib-storage/index/istream-mail.c +++ b/src/lib-storage/index/istream-mail.c @@ -165,5 +165,5 @@ struct istream *i_stream_create_mail(struct mail *mail, struct istream *input, mstream->istream.istream.blocking = input->blocking; mstream->istream.istream.seekable = input->seekable; return i_stream_create(&mstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib-storage/index/mbox/istream-raw-mbox.c b/src/lib-storage/index/mbox/istream-raw-mbox.c index 8dac7b883f..6001b1c1b4 100644 --- a/src/lib-storage/index/mbox/istream-raw-mbox.c +++ b/src/lib-storage/index/mbox/istream-raw-mbox.c @@ -452,7 +452,7 @@ struct istream *i_stream_create_raw_mbox(struct istream *input) rstream->istream.istream.blocking = input->blocking; rstream->istream.istream.seekable = input->seekable; - return i_stream_create(&rstream->istream, input, -1); + return i_stream_create(&rstream->istream, input, -1, 0); } static int istream_raw_mbox_is_valid_from(struct raw_mbox_istream *rstream) diff --git a/src/lib-test/test-istream.c b/src/lib-test/test-istream.c index 08d9e2abf5..84f06b1b65 100644 --- a/src/lib-test/test-istream.c +++ b/src/lib-test/test-istream.c @@ -111,7 +111,7 @@ struct istream *test_istream_create_data(const void *data, size_t size) tstream->istream.istream.blocking = FALSE; tstream->istream.istream.seekable = TRUE; - i_stream_create(&tstream->istream, NULL, -1); + i_stream_create(&tstream->istream, NULL, -1, 0); tstream->istream.statbuf.st_size = tstream->max_pos = size; tstream->allow_eof = TRUE; tstream->istream.max_buffer_size = (size_t)-1; diff --git a/src/lib/istream-base64-decoder.c b/src/lib/istream-base64-decoder.c index b223fbebdc..e1fe8cff9c 100644 --- a/src/lib/istream-base64-decoder.c +++ b/src/lib/istream-base64-decoder.c @@ -154,5 +154,5 @@ i_stream_create_base64_decoder(struct istream *input) bstream->istream.istream.blocking = input->blocking; bstream->istream.istream.seekable = input->seekable; return i_stream_create(&bstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib/istream-base64-encoder.c b/src/lib/istream-base64-encoder.c index c51fdcda1c..56b35b2ae9 100644 --- a/src/lib/istream-base64-encoder.c +++ b/src/lib/istream-base64-encoder.c @@ -195,5 +195,5 @@ i_stream_create_base64_encoder(struct istream *input, bstream->istream.istream.blocking = input->blocking; bstream->istream.istream.seekable = input->seekable; return i_stream_create(&bstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib/istream-callback.c b/src/lib/istream-callback.c index 77f0a85edb..56b62ae885 100644 --- a/src/lib/istream-callback.c +++ b/src/lib/istream-callback.c @@ -79,7 +79,7 @@ i_stream_create_callback(istream_callback_read_t *callback, void *context) cstream->istream.iostream.destroy = i_stream_callback_destroy; cstream->istream.read = i_stream_callback_read; - istream = i_stream_create(&cstream->istream, NULL, -1); + istream = i_stream_create(&cstream->istream, NULL, -1, 0); istream->blocking = TRUE; return istream; } diff --git a/src/lib/istream-chain.c b/src/lib/istream-chain.c index 064ca7ce08..cffdb74a84 100644 --- a/src/lib/istream-chain.c +++ b/src/lib/istream-chain.c @@ -309,5 +309,5 @@ struct istream *i_stream_create_chain(struct istream_chain **chain_r) cstream->istream.istream.seekable = FALSE; *chain_r = &cstream->chain; - return i_stream_create(&cstream->istream, NULL, -1); + return i_stream_create(&cstream->istream, NULL, -1, 0); } diff --git a/src/lib/istream-concat.c b/src/lib/istream-concat.c index fe0ce1f0f9..d9739f089c 100644 --- a/src/lib/istream-concat.c +++ b/src/lib/istream-concat.c @@ -363,5 +363,5 @@ struct istream *i_stream_create_concat(struct istream *input[]) cstream->istream.istream.readable_fd = FALSE; cstream->istream.istream.blocking = blocking; cstream->istream.istream.seekable = seekable; - return i_stream_create(&cstream->istream, NULL, -1); + return i_stream_create(&cstream->istream, NULL, -1, 0); } diff --git a/src/lib/istream-crlf.c b/src/lib/istream-crlf.c index f41c1eed0d..7a308e8ba5 100644 --- a/src/lib/istream-crlf.c +++ b/src/lib/istream-crlf.c @@ -190,7 +190,7 @@ i_stream_create_crlf_full(struct istream *input, bool crlf) cstream->istream.istream.blocking = input->blocking; cstream->istream.istream.seekable = FALSE; return i_stream_create(&cstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } struct istream *i_stream_create_crlf(struct istream *input) diff --git a/src/lib/istream-data.c b/src/lib/istream-data.c index 327cd69929..73c7ad969b 100644 --- a/src/lib/istream-data.c +++ b/src/lib/istream-data.c @@ -31,7 +31,7 @@ struct istream *i_stream_create_from_data(const void *data, size_t size) stream->istream.readable_fd = FALSE; stream->istream.blocking = TRUE; stream->istream.seekable = TRUE; - i_stream_create(stream, NULL, -1); + i_stream_create(stream, NULL, -1, 0); stream->statbuf.st_size = size; i_stream_set_name(&stream->istream, "(buffer)"); return &stream->istream; diff --git a/src/lib/istream-failure-at.c b/src/lib/istream-failure-at.c index f907ede747..4320aafdd7 100644 --- a/src/lib/istream-failure-at.c +++ b/src/lib/istream-failure-at.c @@ -79,7 +79,7 @@ i_stream_create_failure_at(struct istream *input, uoff_t failure_offset, fstream->error_string = i_strdup(error_string); fstream->failure_offset = failure_offset; return i_stream_create(&fstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } struct istream * diff --git a/src/lib/istream-file.c b/src/lib/istream-file.c index 57dfb9d3e1..bdcd524016 100644 --- a/src/lib/istream-file.c +++ b/src/lib/istream-file.c @@ -231,7 +231,7 @@ i_stream_create_file_common(struct file_istream *fstream, } fstream->istream.istream.readable_fd = TRUE; - input = i_stream_create(&fstream->istream, NULL, fd); + input = i_stream_create(&fstream->istream, NULL, fd, 0); i_stream_set_name(input, is_file ? "(file)" : "(fd)"); return input; } diff --git a/src/lib/istream-hash.c b/src/lib/istream-hash.c index 1fe72896a3..25c98f5b4d 100644 --- a/src/lib/istream-hash.c +++ b/src/lib/istream-hash.c @@ -81,5 +81,5 @@ i_stream_create_hash(struct istream *input, const struct hash_method *method, hstream->method = method; hstream->hash_context = hash_context; return i_stream_create(&hstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib/istream-jsonstr.c b/src/lib/istream-jsonstr.c index f5254c65c9..e260bf3ac9 100644 --- a/src/lib/istream-jsonstr.c +++ b/src/lib/istream-jsonstr.c @@ -183,5 +183,5 @@ struct istream *i_stream_create_jsonstr(struct istream *input) dstream->istream.istream.blocking = input->blocking; dstream->istream.istream.seekable = FALSE; return i_stream_create(&dstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib/istream-limit.c b/src/lib/istream-limit.c index 8a5e140069..f57245bb17 100644 --- a/src/lib/istream-limit.c +++ b/src/lib/istream-limit.c @@ -124,7 +124,7 @@ struct istream *i_stream_create_limit(struct istream *input, uoff_t v_size) lstream->istream.istream.blocking = input->blocking; lstream->istream.istream.seekable = input->seekable; return i_stream_create(&lstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } struct istream *i_stream_create_range(struct istream *input, diff --git a/src/lib/istream-mmap.c b/src/lib/istream-mmap.c index 7dd37a4b63..82c27498a2 100644 --- a/src/lib/istream-mmap.c +++ b/src/lib/istream-mmap.c @@ -244,7 +244,7 @@ struct istream *i_stream_create_mmap(int fd, size_t block_size, mstream->istream.istream.readable_fd = TRUE; mstream->istream.start_offset = start_offset; - istream = i_stream_create(&mstream->istream, NULL, fd); + istream = i_stream_create(&mstream->istream, NULL, fd, 0); istream->mmaped = TRUE; istream->blocking = TRUE; istream->seekable = TRUE; diff --git a/src/lib/istream-multiplex.c b/src/lib/istream-multiplex.c index 186472a64d..51858e5168 100644 --- a/src/lib/istream-multiplex.c +++ b/src/lib/istream-multiplex.c @@ -248,7 +248,7 @@ i_stream_add_channel_real(struct multiplex_istream *mstream, uint8_t cid) channel->istream.fd = -1; array_append(&channel->mstream->channels, &channel, 1); - return i_stream_create(&channel->istream, NULL, channel->istream.fd); + return i_stream_create(&channel->istream, NULL, channel->istream.fd, 0); } struct istream *i_stream_multiplex_add_channel(struct istream *stream, uint8_t cid) diff --git a/src/lib/istream-private.h b/src/lib/istream-private.h index b86676b3aa..97b12f15af 100644 --- a/src/lib/istream-private.h +++ b/src/lib/istream-private.h @@ -65,9 +65,13 @@ struct istream_snapshot { struct memarea *old_memarea; }; +enum istream_create_flag { + ISTREAM_CREATE_FLAG_NOOP_DUMMY = 0, +}; + struct istream * ATTR_NOWARN_UNUSED_RESULT -i_stream_create(struct istream_private *stream, struct istream *parent, int fd) - ATTR_NULL(2); +i_stream_create(struct istream_private *stream, struct istream *parent, int fd, + enum istream_create_flag flags) ATTR_NULL(2); /* Initialize parent lazily after i_stream_create() has already been called. */ void i_stream_init_parent(struct istream_private *_stream, struct istream *parent); diff --git a/src/lib/istream-rawlog.c b/src/lib/istream-rawlog.c index 19e89f1f74..17e366a41a 100644 --- a/src/lib/istream-rawlog.c +++ b/src/lib/istream-rawlog.c @@ -112,5 +112,5 @@ i_stream_create_rawlog_from_stream(struct istream *input, rstream->istream.istream.blocking = input->blocking; rstream->istream.istream.seekable = input->seekable; return i_stream_create(&rstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib/istream-seekable.c b/src/lib/istream-seekable.c index f1df575dfb..58f6c0e3af 100644 --- a/src/lib/istream-seekable.c +++ b/src/lib/istream-seekable.c @@ -449,7 +449,7 @@ i_streams_merge(struct istream *input[], size_t max_buffer_size, sstream->istream.istream.readable_fd = FALSE; sstream->istream.istream.blocking = blocking; sstream->istream.istream.seekable = TRUE; - (void)i_stream_create(&sstream->istream, NULL, -1); + (void)i_stream_create(&sstream->istream, NULL, -1, 0); /* initialize our buffer from first stream's pending data */ data = i_stream_get_data(sstream->cur_input, &size); diff --git a/src/lib/istream-sized.c b/src/lib/istream-sized.c index 705a195f9d..ea9036958c 100644 --- a/src/lib/istream-sized.c +++ b/src/lib/istream-sized.c @@ -168,7 +168,7 @@ i_stream_create_sized_common(struct istream *input, uoff_t size) sstream->istream.istream.blocking = input->blocking; sstream->istream.istream.seekable = input->seekable; (void)i_stream_create(&sstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); return sstream; } diff --git a/src/lib/istream-tee.c b/src/lib/istream-tee.c index c8327a566c..608e755a0b 100644 --- a/src/lib/istream-tee.c +++ b/src/lib/istream-tee.c @@ -231,7 +231,7 @@ struct istream *tee_i_stream_create_child(struct tee_istream *tee) tstream->next = tee->children; tee->children = tstream; - ret = i_stream_create(&tstream->istream, input, i_stream_get_fd(input)); + ret = i_stream_create(&tstream->istream, input, i_stream_get_fd(input), 0); i_stream_set_name(&tstream->istream.istream, i_stream_get_name(input)); /* we keep the reference in tee stream, no need for extra references */ i_stream_unref(&input); diff --git a/src/lib/istream-timeout.c b/src/lib/istream-timeout.c index 2a45099c66..7c05c74ff2 100644 --- a/src/lib/istream-timeout.c +++ b/src/lib/istream-timeout.c @@ -138,5 +138,5 @@ i_stream_create_timeout(struct istream *input, unsigned int timeout_msecs) tstream->istream.istream.blocking = input->blocking; tstream->istream.istream.seekable = input->seekable; return i_stream_create(&tstream->istream, input, - i_stream_get_fd(input)); + i_stream_get_fd(input), 0); } diff --git a/src/lib/istream-try.c b/src/lib/istream-try.c index d865efd166..a476f68da1 100644 --- a/src/lib/istream-try.c +++ b/src/lib/istream-try.c @@ -140,5 +140,5 @@ struct istream *istream_try_create(struct istream *const input[]) tstream->istream.istream.readable_fd = FALSE; tstream->istream.istream.blocking = blocking; tstream->istream.istream.seekable = seekable; - return i_stream_create(&tstream->istream, NULL, -1); + return i_stream_create(&tstream->istream, NULL, -1, 0); } diff --git a/src/lib/istream.c b/src/lib/istream.c index dc0d3c74d5..0ed70af2e7 100644 --- a/src/lib/istream.c +++ b/src/lib/istream.c @@ -993,7 +993,8 @@ void i_stream_init_parent(struct istream_private *_stream, } struct istream * -i_stream_create(struct istream_private *_stream, struct istream *parent, int fd) +i_stream_create(struct istream_private *_stream, struct istream *parent, int fd, + enum istream_create_flag flags) { _stream->fd = fd; if (parent != NULL) @@ -1052,7 +1053,7 @@ struct istream *i_stream_create_error(int stream_errno) stream->istream.seekable = TRUE; stream->istream.eof = TRUE; stream->istream.stream_errno = stream_errno; - i_stream_create(stream, NULL, -1); + i_stream_create(stream, NULL, -1, 0); i_stream_set_name(&stream->istream, "(error)"); return &stream->istream; } diff --git a/src/plugins/mail-filter/istream-ext-filter.c b/src/plugins/mail-filter/istream-ext-filter.c index 1b1dc6056e..14d3c65e8d 100644 --- a/src/plugins/mail-filter/istream-ext-filter.c +++ b/src/plugins/mail-filter/istream-ext-filter.c @@ -212,5 +212,5 @@ i_stream_create_ext_filter(struct istream *input, const char *socket_path, mstream->fd = -1; (void)filter_connect(mstream, socket_path, args); - return i_stream_create(&mstream->istream, input, mstream->fd); + return i_stream_create(&mstream->istream, input, mstream->fd, 0); }