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 fd0f2ffaa56bc2ff064915675101a7441acf0555..199bdecf6a44010029584b6b718aa64d0e81ef4f 100644 (file)
--- 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 71ced39b6cbe010d94171fdf12e6351b40db4afe..8ba3d2a2d67b8b0d5bf27866e164065f4fc9c1c0 100644 (file)
--- 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 9231c73c5b5a6fef0f95693b8524a0d6d942311e..7671a21d6c0e49117d42f2a7533da70a4628e7f0 100644 (file)
--- 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 51bbde12ce545f9c02d4fad1585f4c19f192c32d..4905424fe8c1fdcfbed420b92f3883472b539bbd 100644 (file)
--- 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 35c640b7bdd10374cca18d10b69419bcd0d4702b..e134551f5fb5f4c17a9b3f13140fd15be2b086ae 100644 (file)
--- 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 ab1ff03bc214c912c7d7a52590ce5670ed610c75..fc266c8a5171d52740947bc88138c1fd1964a4f8 100644 (file)
--- 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 e9cc75cbc79c091094f4e967803883b87844ace3..30a608e8b4d9d5d2f8318a8d0fa0cb9563fa4990 100644 (file)
--- 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 2fb1a9b652ed4cb2c3235bc67bcfe2103de77b8a..890d19fe2e958279c3b0193a5acd6df720ba0b0e 100644 (file)
--- 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 6cde504a54fef34c452bc5bb3136546f68d8745e..3bf282ecaa1bcc8e139ef4163e063926a8e2e5ed 100644 (file)
--- 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 46c6de860e09626f6cadd6816af70ec8a83d464c..faa75212b2cce0e67ff9a13a76f91dcb0264063d 100644 (file)
--- 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 8420548aeb1ef6d52075d2302bb7802ec161b33b..0670ca7df4f55e0e054948b9ad4231c8b9ae4949 100644 (file)
--- 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 fe8e05d4efa0003aeacb908c01cce09eca6428fb..a89ebc7ee1c48bc31d3282cdc81cf532a5cec82e 100644 (file)
--- 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 da15dd14f94f394ac19865ec0052d2a9b6b14748..36514a9a4b04134e72e1382fdcf4172a57f508dc 100644 (file)
--- 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 5d209d48c8932e6a0f47c755699f04bc4f9bb8bb..d9c483afd125318bca30dc0e3eafa37988829574 100644 (file)
--- 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 3559100394302bd2cdb135ed6cee5eec75e7a83e..04ffd9cd8f70e8234c1bd283bc855181580b3971 100644 (file)
--- 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 cc86654ee7df3a3ed4794522ad12eb06f5eb6686..3d1f4c98311a0f1c30e320bbe303e0a23cd11ebf 100644 (file)
--- 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 19eb0a765d8cbceffae73689856cbc779552d255..48b87dabc682fc927d820d36e549de3ebf1ab8ea 100644 (file)
--- 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 2f986c369f0717d5918414c07de13c02b2b47564..bb1591195e2a28a62f6b60cb20c622e26b24df66 100644 (file)
--- 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 4fb24755a5a67156a3bff8789aa874e640c340ef..4b810adb24446e3eb30473e85b680c26a2930ed3 100644 (file)
--- 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 bc57500150d52ae1f323eefd689708d07cf80908..44d6fdf0258b9c98c1fa3347100666b862257664 100644 (file)
--- 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 8dac7b883fee49374cd80ccaa18b3825b6e206f4..6001b1c1b4ac0a3d66b58ca76cea9587624f88b5 100644 (file)
--- 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 08d9e2abf5e6a3e606b48ae34a89df8aa494cf89..84f06b1b652ccc9af747ab258ba6f6c88c9203b8 100644 (file)
--- 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 b223fbebdcd13ef4f01077e8f238e8af5e89036d..e1fe8cff9c0c845f590e07082e31b5867fd60199 100644 (file)
--- 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 c51fdcda1ccba6598c3f12263d414f28e74e8118..56b35b2ae9b5710905356a05991d4e2cde8001f6 100644 (file)
--- 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 77f0a85edbbe94f10d2b7deb9892e7719e8c0f63..56b62ae8852a8937162a63b123771c4f8aa2f3c7 100644 (file)
--- 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 064ca7ce08c2e28915b4ca1f33c332e1aa573657..cffdb74a84af5639d2c5f8d41382e425e6391e25 100644 (file)
--- 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 fe0ce1f0f92e3e7fcb8c74d61f56c1cfab07b937..d9739f089ce164f02e16c5f02c434519d7285880 100644 (file)
--- 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 f41c1eed0d75c7eb85c39d5e98a7844970f1da0c..7a308e8ba52bcabb2d4e77da6ad5676b11f9c93f 100644 (file)
--- 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 327cd69929f7b20ce0cbc0584f9e759e5a2453be..73c7ad969b8441d0362d603788ad2595770e7797 100644 (file)
--- 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 f907ede74766dbb91afbf619c7b5b412712885e7..4320aafdd783b1ea4871aa33eb52d0903fa57a2d 100644 (file)
--- 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 57dfb9d3e1e4c2eb62720cc3097c08ef6cf649fc..bdcd52401676cee0a4394b63875362ce8b313d8b 100644 (file)
--- 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 1fe72896a3d78dee2621baf40272f65b217de9ac..25c98f5b4d34f7f18379096fec66354f9b453392 100644 (file)
--- 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 f5254c65c949f1e08863c67e4b5da61354317b5b..e260bf3ac9a74aa0f98dde745c843c3a3a02f71a 100644 (file)
--- 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 8a5e140069a8e5d424ab098bb6b39e9c5594b423..f57245bb1794de00ebb98d0346c1115e7c1fde75 100644 (file)
--- 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 7dd37a4b632608050ec6644adb5d5da5501f3378..82c27498a2e007980cf033328e84b93801478ecc 100644 (file)
--- 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 186472a64da758a537f4ac04918bd5558ed73563..51858e51681514ef3dec3eeb4b78d785deff36b1 100644 (file)
--- 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 b86676b3aa75544f45c036e63d8b26d16afaed14..97b12f15af4d9586f932b2f74f1871c8e87e7e24 100644 (file)
--- 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 19e89f1f74905363468e60640a37ac8077652a37..17e366a41abb159d498886c79cd8a0c0b999fb64 100644 (file)
--- 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 f1df575dfb7ac5f1854d54b133c8681b87cb50bc..58f6c0e3af3b6ef04f119bf1f3c8120a54d8d234 100644 (file)
--- 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 705a195f9d6d1cf84e1251843f29709c173c87b0..ea9036958c037104e95b838ffc14845fc6dc19fd 100644 (file)
--- 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 c8327a566c8feccf6b868528fac42789c6df421a..608e755a0bf71d1bd02112d0fab1965a05a66824 100644 (file)
--- 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 2a45099c669ba099800ad0f53096ca980db0dc2d..7c05c74ff2d4435fe41ca677fc27b3ca55180711 100644 (file)
--- 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 d865efd166727f03dec674c2a8339f17a6220b87..a476f68da195ec863bfb47a61054bfe695d66e16 100644 (file)
--- 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 dc0d3c74d5092564f006ba5f80f261940acde610..0ed70af2e74ad41bae792fc636d6af483af965a0 100644 (file)
--- 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 1b1dc6056e85f80e3706e46a671a0ea0d4c58575..14d3c65e8d608e7ec565a296775508954cff3940 100644 (file)
--- 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);
 }