[dovecot-cvs] dovecot/src/lib-index/maildir maildir-index.h,1.10,1.11 maildir-open.c,1.11,1.12 maildir-update.c,1.13,1.14

[cras at procontrol.fi]

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

Modified Files:
	maildir-index.h maildir-open.c maildir-update.c 
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-index.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-index.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- maildir-index.h	2 Nov 2002 20:10:20 -0000	1.10
+++ maildir-index.h	6 Dec 2002 01:09:23 -0000	1.11
@@ -20,7 +20,7 @@
 int maildir_index_build_dir(MailIndex *index, const char *source_dir,
 			    const char *dest_dir);
 
-IBuffer *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
+IStream *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
 			   time_t *internal_date, int *deleted);
 
 int maildir_record_update(MailIndex *index, MailIndexUpdate *update, int fd);

Index: maildir-open.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-open.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- maildir-open.c	21 Nov 2002 20:31:03 -0000	1.11
+++ maildir-open.c	6 Dec 2002 01:09:23 -0000	1.12
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "maildir-index.h"
 #include "mail-index-data.h"
 #include "mail-index-util.h"
@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-IBuffer *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
+IStream *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
 			   time_t *internal_date, int *deleted)
 {
 	struct stat st;
@@ -54,10 +54,10 @@
 	}
 
 	if (index->mail_read_mmaped) {
-		return i_buffer_create_mmap(fd, default_pool,
+		return i_stream_create_mmap(fd, default_pool,
 					    MAIL_MMAP_BLOCK_SIZE, 0, 0, TRUE);
 	} else {
-		return i_buffer_create_file(fd, default_pool,
+		return i_stream_create_file(fd, default_pool,
 					    MAIL_READ_BLOCK_SIZE, TRUE);
 	}
 }

Index: maildir-update.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-update.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- maildir-update.c	21 Nov 2002 20:31:03 -0000	1.13
+++ maildir-update.c	6 Dec 2002 01:09:23 -0000	1.14
@@ -1,12 +1,12 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "maildir-index.h"
 
 int maildir_record_update(MailIndex *index, MailIndexUpdate *update, int fd)
 {
-	IBuffer *inbuf;
+	IStream *input;
         MailDataField cache_fields;
 
 	/* don't even bother opening the file if we're not going to do
@@ -17,14 +17,14 @@
 
 	t_push();
 	if (index->mail_read_mmaped) {
-		inbuf = i_buffer_create_mmap(fd, data_stack_pool,
+		input = i_stream_create_mmap(fd, data_stack_pool,
 					     MAIL_MMAP_BLOCK_SIZE, 0, 0, FALSE);
 	} else {
-		inbuf = i_buffer_create_file(fd, data_stack_pool,
+		input = i_stream_create_file(fd, data_stack_pool,
 					     MAIL_READ_BLOCK_SIZE, FALSE);
 	}
-	mail_index_update_headers(update, inbuf, cache_fields, NULL, NULL);
-	i_buffer_unref(inbuf);
+	mail_index_update_headers(update, input, cache_fields, NULL, NULL);
+	i_stream_unref(input);
 	t_pop();
 	return TRUE;
 }