dovecot: Renamed i_stream_create_file() to i_stream_create_fd().
dovecot at dovecot.org
dovecot at dovecot.org
Thu Aug 2 19:06:40 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/896cc473c1f0
changeset: 6162:896cc473c1f0
user: Timo Sirainen <tss at iki.fi>
date: Thu Aug 02 18:27:46 2007 +0300
description:
Renamed i_stream_create_file() to i_stream_create_fd().
diffstat:
40 files changed, 56 insertions(+), 57 deletions(-)
src/auth/auth-client-connection.c | 4 ++--
src/auth/auth-master-connection.c | 2 +-
src/auth/auth-worker-client.c | 4 ++--
src/auth/auth-worker-server.c | 4 ++--
src/auth/db-passwd-file.c | 2 +-
src/deliver/auth-client.c | 2 +-
src/deliver/deliver.c | 4 ++--
src/deliver/duplicate.c | 2 +-
src/dict/dict-server.c | 4 ++--
src/imap-login/client.c | 2 +-
src/imap/client.c | 3 +--
src/lib-auth/auth-server-connection.c | 4 ++--
src/lib-dict/dict-client.c | 2 +-
src/lib-dict/dict-sql.c | 2 +-
src/lib-settings/settings.c | 2 +-
src/lib-storage/index/cydir/cydir-mail.c | 2 +-
src/lib-storage/index/dbox/dbox-file.c | 2 +-
src/lib-storage/index/dbox/dbox-uidlist.c | 4 ++--
src/lib-storage/index/maildir/maildir-keywords.c | 2 +-
src/lib-storage/index/maildir/maildir-mail.c | 2 +-
src/lib-storage/index/maildir/maildir-uidlist.c | 2 +-
src/lib-storage/index/mbox/mbox-file.c | 4 ++--
src/lib-storage/list/subscription-file.c | 8 ++++----
src/lib/file-copy.c | 2 +-
src/lib/istream-file.c | 4 ++--
src/lib/istream-seekable.c | 2 +-
src/lib/istream.c | 6 +++---
src/lib/istream.h | 4 ++--
src/login-common/login-proxy.c | 4 ++--
src/login-common/master.c | 2 +-
src/master/auth-process.c | 2 +-
src/master/log.c | 2 +-
src/plugins/acl/acl-backend-vfile-acllist.c | 2 +-
src/plugins/acl/acl-backend-vfile.c | 2 +-
src/plugins/expire/auth-client.c | 2 +-
src/plugins/fts-squat/squat-test.c | 2 +-
src/plugins/trash/trash-plugin.c | 2 +-
src/pop3-login/client.c | 2 +-
src/pop3/client.c | 2 +-
src/util/rawlog.c | 2 +-
diffs (truncated from 548 to 300 lines):
diff -r c62f7ee79446 -r 896cc473c1f0 src/auth/auth-client-connection.c
--- a/src/auth/auth-client-connection.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/auth/auth-client-connection.c Thu Aug 02 18:27:46 2007 +0300
@@ -274,8 +274,8 @@ auth_client_connection_create(struct aut
conn->connect_uid = ++connect_uid_counter;
conn->fd = fd;
- conn->input =
- i_stream_create_file(fd, AUTH_CLIENT_MAX_LINE_LENGTH, FALSE);
+ conn->input = i_stream_create_fd(fd, AUTH_CLIENT_MAX_LINE_LENGTH,
+ FALSE);
conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
o_stream_set_flush_callback(conn->output, auth_client_output, conn);
conn->io = io_add(fd, IO_READ, auth_client_input, conn);
diff -r c62f7ee79446 -r 896cc473c1f0 src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/auth/auth-master-connection.c Thu Aug 02 18:27:46 2007 +0300
@@ -242,7 +242,7 @@ auth_master_connection_create(struct aut
conn->listener = listener;
conn->refcount = 1;
conn->fd = fd;
- conn->input = i_stream_create_file(fd, MAX_INBUF_SIZE, FALSE);
+ conn->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
o_stream_set_flush_callback(conn->output, master_output, conn);
conn->io = io_add(fd, IO_READ, master_input, conn);
diff -r c62f7ee79446 -r 896cc473c1f0 src/auth/auth-worker-client.c
--- a/src/auth/auth-worker-client.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/auth/auth-worker-client.c Thu Aug 02 18:27:46 2007 +0300
@@ -467,8 +467,8 @@ auth_worker_client_create(struct auth *a
client->auth = auth;
client->fd = fd;
- client->input =
- i_stream_create_file(fd, AUTH_WORKER_MAX_LINE_LENGTH, FALSE);
+ client->input = i_stream_create_fd(fd, AUTH_WORKER_MAX_LINE_LENGTH,
+ FALSE);
client->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
o_stream_set_flush_callback(client->output, auth_worker_output, client);
client->io = io_add(fd, IO_READ, auth_worker_input, client);
diff -r c62f7ee79446 -r 896cc473c1f0 src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/auth/auth-worker-server.c Thu Aug 02 18:27:46 2007 +0300
@@ -79,8 +79,8 @@ static struct auth_worker_connection *au
conn = i_new(struct auth_worker_connection, 1);
conn->fd = fd;
- conn->input = i_stream_create_file(fd, AUTH_WORKER_MAX_LINE_LENGTH,
- FALSE);
+ conn->input = i_stream_create_fd(fd, AUTH_WORKER_MAX_LINE_LENGTH,
+ FALSE);
conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
conn->io = io_add(fd, IO_READ, worker_input, conn);
conn->requests = buffer_create_dynamic(default_pool, 128);
diff -r c62f7ee79446 -r 896cc473c1f0 src/auth/db-passwd-file.c
--- a/src/auth/db-passwd-file.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/auth/db-passwd-file.c Thu Aug 02 18:27:46 2007 +0300
@@ -183,7 +183,7 @@ static bool passwd_file_open(struct pass
pw->users = hash_create(default_pool, pw->pool, 100,
str_hash, (hash_cmp_callback_t *)strcmp);
- input = i_stream_create_file(pw->fd, 4096, FALSE);
+ input = i_stream_create_fd(pw->fd, 4096, FALSE);
while ((line = i_stream_read_next_line(input)) != NULL) {
if (*line == '\0' || *line == ':' || *line == '#')
continue; /* no username or comment */
diff -r c62f7ee79446 -r 896cc473c1f0 src/deliver/auth-client.c
--- a/src/deliver/auth-client.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/deliver/auth-client.c Thu Aug 02 18:27:46 2007 +0300
@@ -179,7 +179,7 @@ static struct auth_connection *auth_conn
conn = i_new(struct auth_connection, 1);
conn->fd = fd;
- conn->input = i_stream_create_file(fd, MAX_INBUF_SIZE, FALSE);
+ conn->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
conn->output = o_stream_create_fd(fd, MAX_OUTBUF_SIZE, FALSE);
conn->io = io_add(fd, IO_READ, auth_input, conn);
return conn;
diff -r c62f7ee79446 -r 896cc473c1f0 src/deliver/deliver.c
--- a/src/deliver/deliver.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/deliver/deliver.c Thu Aug 02 18:27:46 2007 +0300
@@ -229,7 +229,7 @@ static void config_file_init(const char
i_fatal_status(EX_CONFIG, "open(%s) failed: %m", path);
t_push();
- input = i_stream_create_file(fd, 1024, TRUE);
+ input = i_stream_create_fd(fd, 1024, TRUE);
while ((line = i_stream_read_next_line(input)) != NULL) {
/* @UNSAFE: line is modified */
@@ -417,7 +417,7 @@ static struct istream *create_mbox_strea
envelope_sender = address_sanitize(envelope_sender);
mbox_hdr = mbox_from_create(envelope_sender, ioloop_time);
- input = i_stream_create_file(fd, 4096, FALSE);
+ input = i_stream_create_fd(fd, 4096, FALSE);
input_filter =
i_stream_create_header_filter(input,
HEADER_FILTER_EXCLUDE |
diff -r c62f7ee79446 -r 896cc473c1f0 src/deliver/duplicate.c
--- a/src/deliver/duplicate.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/deliver/duplicate.c Thu Aug 02 18:27:46 2007 +0300
@@ -94,7 +94,7 @@ static int duplicate_read(struct duplica
}
/* <timestamp> <id_size> <user_size> <id> <user> */
- input = i_stream_create_file(fd, 4096, FALSE);
+ input = i_stream_create_fd(fd, 4096, FALSE);
change_count = 0;
while (i_stream_read_data(input, &data, &size, sizeof(stamp) +
diff -r c62f7ee79446 -r 896cc473c1f0 src/dict/dict-server.c
--- a/src/dict/dict-server.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/dict/dict-server.c Thu Aug 02 18:27:46 2007 +0300
@@ -446,8 +446,8 @@ dict_client_connection_init(struct dict_
conn = i_new(struct dict_client_connection, 1);
conn->server = server;
conn->fd = fd;
- conn->input = i_stream_create_file(fd, DICT_CLIENT_MAX_LINE_LENGTH,
- FALSE);
+ conn->input = i_stream_create_fd(fd, DICT_CLIENT_MAX_LINE_LENGTH,
+ FALSE);
conn->output = o_stream_create_fd(fd, 128*1024, FALSE);
conn->io = io_add(fd, IO_READ, dict_client_connection_input, conn);
return conn;
diff -r c62f7ee79446 -r 896cc473c1f0 src/imap-login/client.c
--- a/src/imap-login/client.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/imap-login/client.c Thu Aug 02 18:27:46 2007 +0300
@@ -68,7 +68,7 @@ static void client_set_title(struct imap
static void client_open_streams(struct imap_client *client, int fd)
{
- client->input = i_stream_create_file(fd, MAX_INBUF_SIZE, FALSE);
+ client->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
client->output = o_stream_create_fd(fd, MAX_OUTBUF_SIZE, FALSE);
client->parser = imap_parser_create(client->input, client->output,
MAX_IMAP_LINE);
diff -r c62f7ee79446 -r 896cc473c1f0 src/imap/client.c
--- a/src/imap/client.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/imap/client.c Thu Aug 02 18:27:46 2007 +0300
@@ -30,8 +30,7 @@ struct client *client_create(int fd_in,
client = i_new(struct client, 1);
client->fd_in = fd_in;
client->fd_out = fd_out;
- client->input =
- i_stream_create_file(fd_in, imap_max_line_length, FALSE);
+ client->input = i_stream_create_fd(fd_in, imap_max_line_length, FALSE);
client->output = o_stream_create_fd(fd_out, (size_t)-1, FALSE);
o_stream_set_flush_callback(client->output, _client_output, client);
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-auth/auth-server-connection.c
--- a/src/lib-auth/auth-server-connection.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-auth/auth-server-connection.c Thu Aug 02 18:27:46 2007 +0300
@@ -226,8 +226,8 @@ auth_server_connection_new(struct auth_c
conn->path = p_strdup(pool, path);
conn->fd = fd;
conn->io = io_add(fd, IO_READ, auth_client_input, conn);
- conn->input = i_stream_create_file(fd, AUTH_CLIENT_MAX_LINE_LENGTH,
- FALSE);
+ conn->input = i_stream_create_fd(fd, AUTH_CLIENT_MAX_LINE_LENGTH,
+ FALSE);
conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
conn->requests = hash_create(default_pool, pool, 100, NULL, NULL);
conn->auth_mechs_buf = buffer_create_dynamic(default_pool, 256);
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-dict/dict-client.c
--- a/src/lib-dict/dict-client.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-dict/dict-client.c Thu Aug 02 18:27:46 2007 +0300
@@ -244,7 +244,7 @@ static int client_dict_connect(struct cl
/* Dictionary lookups are blocking */
net_set_nonblock(dict->fd, FALSE);
- dict->input = i_stream_create_file(dict->fd, (size_t)-1, FALSE);
+ dict->input = i_stream_create_fd(dict->fd, (size_t)-1, FALSE);
dict->output = o_stream_create_fd(dict->fd, 4096, FALSE);
dict->transaction_id_counter = 0;
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-dict/dict-sql.c
--- a/src/lib-dict/dict-sql.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-dict/dict-sql.c Thu Aug 02 18:27:46 2007 +0300
@@ -48,7 +48,7 @@ static int sql_dict_read_config(struct s
return -1;
}
- input = i_stream_create_file(fd, (size_t)-1, FALSE);
+ input = i_stream_create_fd(fd, (size_t)-1, FALSE);
while ((line = i_stream_read_next_line(input)) != NULL) {
while (*line == ' ') line++;
value = strchr(line, '=');
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-settings/settings.c
--- a/src/lib-settings/settings.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-settings/settings.c Thu Aug 02 18:27:46 2007 +0300
@@ -94,7 +94,7 @@ bool settings_read(const char *path, con
full_line = t_str_new(512);
linenum = 0; sections = 0; root_section = 0; errormsg = NULL;
- input = i_stream_create_file(fd, 2048, TRUE);
+ input = i_stream_create_fd(fd, 2048, TRUE);
for (;;) {
line = i_stream_read_next_line(input);
if (line == NULL) {
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/cydir/cydir-mail.c
--- a/src/lib-storage/index/cydir/cydir-mail.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/cydir/cydir-mail.c Thu Aug 02 18:27:46 2007 +0300
@@ -113,7 +113,7 @@ cydir_mail_get_stream(struct mail *_mail
return NULL;
}
mail->data.stream =
- i_stream_create_file(fd, MAIL_READ_BLOCK_SIZE, TRUE);
+ i_stream_create_fd(fd, MAIL_READ_BLOCK_SIZE, TRUE);
}
return index_mail_init_stream(mail, hdr_size, body_size);
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/dbox/dbox-file.c
--- a/src/lib-storage/index/dbox/dbox-file.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/dbox/dbox-file.c Thu Aug 02 18:27:46 2007 +0300
@@ -132,7 +132,7 @@ int dbox_file_seek(struct dbox_mailbox *
}
mbox->file->input =
- i_stream_create_file(mbox->file->fd, 65536, FALSE);
+ i_stream_create_fd(mbox->file->fd, 65536, FALSE);
if (dbox_file_read_header(mbox, mbox->file) < 0)
return -1;
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/dbox/dbox-uidlist.c
--- a/src/lib-storage/index/dbox/dbox-uidlist.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/dbox/dbox-uidlist.c Thu Aug 02 18:27:46 2007 +0300
@@ -353,7 +353,7 @@ static int dbox_uidlist_read(struct dbox
uidlist->ino = st.st_ino;
uidlist->mtime = st.st_mtime;
- input = i_stream_create_file(uidlist->fd, 65536, FALSE);
+ input = i_stream_create_fd(uidlist->fd, 65536, FALSE);
/* read header: <version> <uidvalidity> <next-uid>.
Note that <next-uid> may be updated by UID lines, so it can't be
@@ -967,7 +967,7 @@ dbox_file_append(struct dbox_uidlist_app
file->path = i_strdup(path);
file->fd = fd;
- file->input = i_stream_create_file(file->fd, 65536, FALSE);
+ file->input = i_stream_create_fd(file->fd, 65536, FALSE);
file->output = o_stream_create_fd_file(file->fd, 0, FALSE);
if ((uoff_t)st->st_size < sizeof(struct dbox_file_header)) {
if (dbox_file_write_header(mbox, file) < 0) {
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/maildir/maildir-keywords.c
--- a/src/lib-storage/index/maildir/maildir-keywords.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-keywords.c Thu Aug 02 18:27:46 2007 +0300
@@ -133,7 +133,7 @@ static int maildir_keywords_sync(struct
}
maildir_keywords_clear(mk);
- input = i_stream_create_file(fd, 1024, FALSE);
+ input = i_stream_create_fd(fd, 1024, FALSE);
while ((line = i_stream_read_next_line(input)) != NULL) {
p = strchr(line, ' ');
if (p == NULL) {
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/maildir/maildir-mail.c
--- a/src/lib-storage/index/maildir/maildir-mail.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-mail.c Thu Aug 02 18:27:46 2007 +0300
@@ -62,7 +62,7 @@ maildir_open_mail(struct maildir_mailbox
return NULL;
}
- return i_stream_create_file(fd, MAIL_READ_BLOCK_SIZE, TRUE);
+ return i_stream_create_fd(fd, MAIL_READ_BLOCK_SIZE, TRUE);
}
static int maildir_mail_stat(struct mail *mail, struct stat *st)
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/maildir/maildir-uidlist.c
--- a/src/lib-storage/index/maildir/maildir-uidlist.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c Thu Aug 02 18:27:46 2007 +0300
@@ -523,7 +523,7 @@ maildir_uidlist_update_read(struct maild
st.st_size/8));
}
- input = i_stream_create_file(fd, 4096, FALSE);
+ input = i_stream_create_fd(fd, 4096, FALSE);
i_stream_seek(input, uidlist->last_read_offset);
orig_next_uid = uidlist->next_uid;
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/index/mbox/mbox-file.c
--- a/src/lib-storage/index/mbox/mbox-file.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-file.c Thu Aug 02 18:27:46 2007 +0300
@@ -87,8 +87,8 @@ int mbox_file_open_stream(struct mbox_ma
mbox->mbox_file_stream = i_stream_create_from_data(NULL, 0);
else {
mbox->mbox_file_stream =
- i_stream_create_file(mbox->mbox_fd,
- MAIL_READ_BLOCK_SIZE, FALSE);
+ i_stream_create_fd(mbox->mbox_fd,
+ MAIL_READ_BLOCK_SIZE, FALSE);
}
mbox->mbox_stream =
diff -r c62f7ee79446 -r 896cc473c1f0 src/lib-storage/list/subscription-file.c
--- a/src/lib-storage/list/subscription-file.c Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib-storage/list/subscription-file.c Thu Aug 02 18:27:46 2007 +0300
@@ -113,8 +113,8 @@ int subsfile_set_subscribed(struct mailb
}
More information about the dovecot-cvs
mailing list