Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6162:896cc473c1f0 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed i_stream_create_file() to i_stream_create_fd().
author Timo Sirainen <tss@iki.fi>
date Thu, 02 Aug 2007 18:27:46 +0300
parents c62f7ee79446
children 48dbfdba4e24
files src/auth/auth-client-connection.c src/auth/auth-master-connection.c src/auth/auth-worker-client.c src/auth/auth-worker-server.c src/auth/db-passwd-file.c src/deliver/auth-client.c src/deliver/deliver.c src/deliver/duplicate.c src/dict/dict-server.c src/imap-login/client.c src/imap/client.c src/lib-auth/auth-server-connection.c src/lib-dict/dict-client.c src/lib-dict/dict-sql.c src/lib-settings/settings.c src/lib-storage/index/cydir/cydir-mail.c src/lib-storage/index/dbox/dbox-file.c src/lib-storage/index/dbox/dbox-uidlist.c src/lib-storage/index/maildir/maildir-keywords.c src/lib-storage/index/maildir/maildir-mail.c src/lib-storage/index/maildir/maildir-uidlist.c src/lib-storage/index/mbox/mbox-file.c src/lib-storage/list/subscription-file.c src/lib/file-copy.c src/lib/istream-file.c src/lib/istream-seekable.c src/lib/istream.c src/lib/istream.h src/login-common/login-proxy.c src/login-common/master.c src/master/auth-process.c src/master/log.c src/plugins/acl/acl-backend-vfile-acllist.c src/plugins/acl/acl-backend-vfile.c src/plugins/expire/auth-client.c src/plugins/fts-squat/squat-test.c src/plugins/trash/trash-plugin.c src/pop3-login/client.c src/pop3/client.c src/util/rawlog.c
diffstat 40 files changed, 56 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 	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);
--- 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 @@
 	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);
--- 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 @@
 
 	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);
--- 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 @@
 
 	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);
--- 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 @@
 	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 */
--- 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 @@
 
 	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;
--- 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 @@
 		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 @@
 	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 |
--- 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 @@
 	}
 
 	/* <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) +
--- 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 @@
 	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;
--- 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_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);
--- 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 @@
 	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);
--- 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 @@
 	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);
--- 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 @@
 	/* 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;
 
--- 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 @@
 		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, '=');
--- 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 @@
 
 	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) {
--- 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 @@
 			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);
--- 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 @@
 		}
 
 		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;
--- 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 @@
 	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 @@
 	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) {
--- 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 @@
 	}
 
 	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) {
--- 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 @@
 		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)
--- 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 @@
 							    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;
--- 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 @@
 		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 =
--- 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 @@
 	}
 
 	input = fd_in == -1 ? NULL :
-		i_stream_create_file(fd_in, list->mailbox_name_max_length+1,
-				     TRUE);
+		i_stream_create_fd(fd_in, list->mailbox_name_max_length+1,
+				   TRUE);
 	output = o_stream_create_fd_file(fd_out, 0, FALSE);
 	found = FALSE;
 	while ((line = next_line(list, path, input,
@@ -185,7 +185,7 @@
 			ctx->failed = TRUE;
 		}
 	} else {
-		ctx->input = i_stream_create_file(fd,
+		ctx->input = i_stream_create_fd(fd,
 					list->mailbox_name_max_length+1, TRUE);
 	}
 	ctx->path = i_strdup(path);
@@ -238,7 +238,7 @@
                         return NULL;
                 }
 
-		ctx->input = i_stream_create_file(fd,
+		ctx->input = i_stream_create_fd(fd,
 					ctx->list->mailbox_name_max_length+1,
 					TRUE);
         }
--- a/src/lib/file-copy.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib/file-copy.c	Thu Aug 02 18:27:46 2007 +0300
@@ -68,7 +68,7 @@
 	/* try to change the group, don't really care if it fails */
 	(void)fchown(fd_out, (uid_t)-1, st.st_gid);
 
-	input = i_stream_create_file(fd_in, 0, FALSE);
+	input = i_stream_create_fd(fd_in, 0, FALSE);
 	output = o_stream_create_fd_file(fd_out, 0, FALSE);
 
 	while ((ret = o_stream_send_istream(output, input)) > 0) ;
--- a/src/lib/istream-file.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib/istream-file.c	Thu Aug 02 18:27:46 2007 +0300
@@ -159,8 +159,8 @@
 	return &stream->statbuf;
 }
 
-struct istream *i_stream_create_file(int fd, size_t max_buffer_size,
-				     bool autoclose_fd)
+struct istream *i_stream_create_fd(int fd, size_t max_buffer_size,
+				   bool autoclose_fd)
 {
 	struct file_istream *fstream;
 	struct stat st;
--- a/src/lib/istream-seekable.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib/istream-seekable.c	Thu Aug 02 18:27:46 2007 +0300
@@ -122,7 +122,7 @@
 
 	sstream->fd = fd;
 	sstream->fd_input =
-		i_stream_create_file(fd, sstream->max_buffer_size, TRUE);
+		i_stream_create_fd(fd, sstream->max_buffer_size, TRUE);
 	return 0;
 }
 
--- a/src/lib/istream.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib/istream.c	Thu Aug 02 18:27:46 2007 +0300
@@ -367,7 +367,7 @@
 	write(fd1, buf, sizeof(buf));
 
 	/* test reading */
-	input = i_stream_create_file(fd1, 512, FALSE);
+	input = i_stream_create_fd(fd1, 512, FALSE);
 	i_assert(i_stream_get_size(input) == sizeof(buf));
 
 	i_assert(i_stream_read_data(input, &data, &size, 0) > 0);
@@ -390,8 +390,8 @@
 	check_buffer(data, size, 900);
 
 	/* test moving data */
-	output1 = o_stream_create_file(fd1, 512, FALSE);
-	output2 = o_stream_create_file(fd2, 512, FALSE);
+	output1 = o_stream_create_fd(fd1, 512, FALSE);
+	output2 = o_stream_create_fd(fd2, 512, FALSE);
 
 	i_stream_seek(input, 1); size = sizeof(buf)-1;
 	i_assert(o_stream_send_istream(output2, input) == size);
--- a/src/lib/istream.h	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/lib/istream.h	Thu Aug 02 18:27:46 2007 +0300
@@ -18,8 +18,8 @@
 	struct _istream *real_stream;
 };
 
-struct istream *i_stream_create_file(int fd, size_t max_buffer_size,
-				     bool autoclose_fd);
+struct istream *i_stream_create_fd(int fd, size_t max_buffer_size,
+				   bool autoclose_fd);
 struct istream *i_stream_create_mmap(int fd, size_t block_size,
 				     uoff_t start_offset, uoff_t v_size,
 				     bool autoclose_fd);
--- a/src/login-common/login-proxy.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/login-common/login-proxy.c	Thu Aug 02 18:27:46 2007 +0300
@@ -121,8 +121,8 @@
 
 	/* connect successful */
 	proxy->server_input =
-		i_stream_create_file(proxy->server_fd, MAX_PROXY_INPUT_SIZE,
-				     FALSE);
+		i_stream_create_fd(proxy->server_fd, MAX_PROXY_INPUT_SIZE,
+				   FALSE);
 	proxy->server_output =
 		o_stream_create_fd(proxy->server_fd, (size_t)-1, FALSE);
 
--- a/src/login-common/master.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/login-common/master.c	Thu Aug 02 18:27:46 2007 +0300
@@ -165,7 +165,7 @@
 	env_clean();
 
 	/* read environment variable lines until empty line comes */
-	input = i_stream_create_file(fd, 8192, FALSE);
+	input = i_stream_create_fd(fd, 8192, FALSE);
 	do {
 		switch (i_stream_read(input)) {
 		case -1:
--- a/src/master/auth-process.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/master/auth-process.c	Thu Aug 02 18:27:46 2007 +0300
@@ -297,7 +297,7 @@
 	p->pid = pid;
 	p->fd = fd;
 	p->io = io_add(fd, IO_READ, auth_process_input, p);
-	p->input = i_stream_create_file(fd, MAX_INBUF_SIZE, FALSE);
+	p->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
 	p->output = o_stream_create_fd(fd, MAX_OUTBUF_SIZE, FALSE);
 	p->requests = hash_create(default_pool, default_pool, 0, NULL, NULL);
 
--- a/src/master/log.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/master/log.c	Thu Aug 02 18:27:46 2007 +0300
@@ -179,7 +179,7 @@
 
 	log_io = i_new(struct log_io, 1);
 	log_io->refcount = 1;
-	log_io->stream = i_stream_create_file(fd[0], 1024, TRUE);
+	log_io->stream = i_stream_create_fd(fd[0], 1024, TRUE);
 	log_io->max_lines_per_sec =
 		max_lines_per_sec != 0 ? max_lines_per_sec : (unsigned int)-1;
 
--- a/src/plugins/acl/acl-backend-vfile-acllist.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/plugins/acl/acl-backend-vfile-acllist.c	Thu Aug 02 18:27:46 2007 +0300
@@ -83,7 +83,7 @@
 	backend->acllist_mtime = st.st_mtime;
 	acllist_clear(backend, st.st_size);
 
-	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) {
 		acllist.mtime = 0;
 		for (p = line; *p >= '0' && *p <= '9'; p++)
--- a/src/plugins/acl/acl-backend-vfile.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/plugins/acl/acl-backend-vfile.c	Thu Aug 02 18:27:46 2007 +0300
@@ -345,7 +345,7 @@
 	if (aclobj->aclobj.backend->debug)
 		i_info("acl vfile: reading file %s", path);
 
-	input = i_stream_create_file(fd, 4096, FALSE);
+	input = i_stream_create_fd(fd, 4096, FALSE);
 
 	if (!array_is_created(&aclobj->rights)) {
 		aclobj->rights_pool =
--- a/src/plugins/expire/auth-client.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/plugins/expire/auth-client.c	Thu Aug 02 18:27:46 2007 +0300
@@ -46,7 +46,7 @@
 	}
 
 	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);
 
--- a/src/plugins/fts-squat/squat-test.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/plugins/fts-squat/squat-test.c	Thu Aug 02 18:27:46 2007 +0300
@@ -59,7 +59,7 @@
 		return 1;
 
 	build_ctx = squat_trie_build_init(trie, &last_uid);
-	input = i_stream_create_file(fd, 0, FALSE);
+	input = i_stream_create_fd(fd, 0, FALSE);
 	while ((line = i_stream_read_next_line(input)) != NULL) {
 		if (last != input->v_offset/(1024*100)) {
 			fprintf(stderr, "\r%ukB", (unsigned)(input->v_offset/1024));
--- a/src/plugins/trash/trash-plugin.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/plugins/trash/trash-plugin.c	Thu Aug 02 18:27:46 2007 +0300
@@ -262,7 +262,7 @@
 	p_clear(config_pool);
 	p_array_init(&trash_boxes, config_pool, INIT_TRASH_MAILBOX_COUNT);
 
-	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) {
 		/* <priority> <mailbox name> */
 		name = strchr(line, ' ');
--- a/src/pop3-login/client.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/pop3-login/client.c	Thu Aug 02 18:27:46 2007 +0300
@@ -65,7 +65,7 @@
 
 static void client_open_streams(struct pop3_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);
 }
 
--- a/src/pop3/client.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/pop3/client.c	Thu Aug 02 18:27:46 2007 +0300
@@ -140,7 +140,7 @@
 	client = i_new(struct client, 1);
 	client->fd_in = fd_in;
 	client->fd_out = fd_out;
-	client->input = i_stream_create_file(fd_in, MAX_INBUF_SIZE, FALSE);
+	client->input = i_stream_create_fd(fd_in, MAX_INBUF_SIZE, FALSE);
 	client->output = o_stream_create_fd(fd_out, (size_t)-1, FALSE);
 	o_stream_set_flush_callback(client->output, client_output, client);
 
--- a/src/util/rawlog.c	Thu Aug 02 18:23:22 2007 +0300
+++ b/src/util/rawlog.c	Thu Aug 02 18:27:46 2007 +0300
@@ -240,7 +240,7 @@
 	proxy = i_new(struct rawlog_proxy, 1);
 	proxy->server_fd = server_fd;
 	proxy->server_input =
-		i_stream_create_file(server_fd, MAX_PROXY_INPUT_SIZE, FALSE);
+		i_stream_create_fd(server_fd, MAX_PROXY_INPUT_SIZE, FALSE);
 	proxy->server_output = o_stream_create_fd(server_fd, (size_t)-1, FALSE);
 	proxy->server_io = io_add(server_fd, IO_READ, server_input, proxy);
 	o_stream_set_flush_callback(proxy->server_output, server_output, proxy);