[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-save.c,1.10,1.11 maildir-storage.h,1.7,1.8

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/index/maildir
In directory danu:/tmp/cvs-serv6082/lib-storage/index/maildir

Modified Files:
	maildir-save.c maildir-storage.h 
Log Message:
Renamed IBuffer and OBuffer to IStream and OStream which describes their
functionality better. I tried to keep the variable names and comments also
sensible.



Index: maildir-save.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- maildir-save.c	13 Nov 2002 01:36:16 -0000	1.10
+++ maildir-save.c	6 Dec 2002 01:09:23 -0000	1.11
@@ -3,7 +3,7 @@
 #include "lib.h"
 #include "ioloop.h"
 #include "hostpid.h"
-#include "obuffer.h"
+#include "ostream.h"
 #include "maildir-index.h"
 #include "maildir-storage.h"
 
@@ -48,10 +48,10 @@
 }
 
 static const char *maildir_read_into_tmp(MailStorage *storage, const char *dir,
-					 IBuffer *buf, uoff_t data_size)
+					 IStream *input, uoff_t data_size)
 {
 	const char *fname, *path;
-	OBuffer *outbuf;
+	OStream *output;
 	int fd;
 
 	fd = maildir_create_tmp(storage, dir, &fname);
@@ -59,15 +59,15 @@
 		return NULL;
 
 	t_push();
-	outbuf = o_buffer_create_file(fd, data_stack_pool, 4096,
+	output = o_stream_create_file(fd, data_stack_pool, 4096,
 				      IO_PRIORITY_DEFAULT, FALSE);
-	o_buffer_set_blocking(outbuf, 60000, NULL, NULL);
+	o_stream_set_blocking(output, 60000, NULL, NULL);
 
 	path = t_strconcat(dir, "/", fname, NULL);
-	if (!index_storage_save(storage, path, buf, outbuf, data_size))
+	if (!index_storage_save(storage, path, input, output, data_size))
 		fname = NULL;
 
-	o_buffer_unref(outbuf);
+	o_stream_unref(output);
 	if (close(fd) < 0)
 		fname = NULL;
 
@@ -80,7 +80,7 @@
 int maildir_storage_save(Mailbox *box, MailFlags flags,
 			 const char *custom_flags[], time_t internal_date,
 			 int timezone_offset __attr_unused__,
-			 IBuffer *data, uoff_t data_size)
+			 IStream *data, uoff_t data_size)
 {
         IndexMailbox *ibox = (IndexMailbox *) box;
         struct utimbuf buf;

Index: maildir-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maildir-storage.h	24 Oct 2002 00:15:39 -0000	1.7
+++ maildir-storage.h	6 Dec 2002 01:09:23 -0000	1.8
@@ -8,7 +8,7 @@
 int maildir_storage_save(Mailbox *box, MailFlags flags,
 			 const char *custom_flags[],
 			 time_t internal_date, int timezone_offset,
-			 IBuffer *data, uoff_t data_size);
+			 IStream *data, uoff_t data_size);
 
 int maildir_find_mailboxes(MailStorage *storage, const char *mask,
 			   MailboxFunc func, void *context);