[dovecot-cvs] dovecot/src/lib-storage/index index-mail-headers.c, 1.58, 1.59 index-mail.c, 1.91, 1.92

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv5842/lib-storage/index

Modified Files:
	index-mail-headers.c index-mail.c 
Log Message:
Added i_stream_destroy() and o_stream_destroy() and used them instead of
*_stream_unref() where possible. Fixes at least one problem with io_remove()
being called after socket was closed, which caused problems with epoll.



Index: index-mail-headers.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail-headers.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- index-mail-headers.c	25 Feb 2006 08:24:18 -0000	1.58
+++ index-mail-headers.c	26 Feb 2006 10:05:15 -0000	1.59
@@ -609,7 +609,7 @@
 				      mail->data.seq, headers->idx,
 				      headers->count) > 0) {
 		if (mail->data.filter_stream != NULL)
-			i_stream_unref(&mail->data.filter_stream);
+			i_stream_destroy(&mail->data.filter_stream);
 		mail->data.filter_stream =
 			i_stream_create_from_data(default_pool,
 						  str_data(dest),
@@ -623,7 +623,7 @@
 		return NULL;
 
 	if (mail->data.filter_stream != NULL)
-		i_stream_unref(&mail->data.filter_stream);
+		i_stream_destroy(&mail->data.filter_stream);
 
 	index_mail_parse_header_init(mail, _headers);
 	mail->data.filter_stream =

Index: index-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- index-mail.c	17 Feb 2006 14:20:08 -0000	1.91
+++ index-mail.c	26 Feb 2006 10:05:15 -0000	1.92
@@ -748,9 +748,9 @@
 static void index_mail_close(struct index_mail *mail)
 {
 	if (mail->data.stream != NULL)
-		i_stream_unref(&mail->data.stream);
+		i_stream_destroy(&mail->data.stream);
 	if (mail->data.filter_stream != NULL)
-		i_stream_unref(&mail->data.filter_stream);
+		i_stream_destroy(&mail->data.filter_stream);
 }
 
 int index_mail_set_seq(struct mail *_mail, uint32_t seq)