[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-keywords.c, 1.4, 1.5 maildir-save.c, 1.65, 1.66 maildir-uidlist.c, 1.45, 1.46

[cras at dovecot.org]

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

Modified Files:
	maildir-keywords.c maildir-save.c maildir-uidlist.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: maildir-keywords.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-keywords.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- maildir-keywords.c	16 Feb 2006 15:23:00 -0000	1.4
+++ maildir-keywords.c	26 Feb 2006 10:05:18 -0000	1.5
@@ -141,7 +141,7 @@
 		strp = array_idx_modifyable(&mk->list, idx);
 		*strp = new_name;
 	}
-	i_stream_unref(&input);
+	i_stream_destroy(&input);
 
 	if (close(fd) < 0) {
                 mail_storage_set_critical(STORAGE(mk->mbox->storage),

Index: maildir-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- maildir-save.c	22 Feb 2006 16:02:27 -0000	1.65
+++ maildir-save.c	26 Feb 2006 10:05:18 -0000	1.66
@@ -257,7 +257,7 @@
 	}
 
 	output_errno = ctx->output->stream_errno;
-	o_stream_unref(&ctx->output);
+	o_stream_destroy(&ctx->output);
 
 	/* FIXME: when saving multiple messages, we could get better
 	   performance if we left the fd open and fsync()ed it later */

Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- maildir-uidlist.c	16 Feb 2006 15:23:00 -0000	1.45
+++ maildir-uidlist.c	26 Feb 2006 10:05:18 -0000	1.46
@@ -338,7 +338,7 @@
                         *retry_r = TRUE;
         }
 
-	i_stream_unref(&input);
+	i_stream_destroy(&input);
 	return ret;
 }