[dovecot-cvs] dovecot/src/lib-storage/subscription-file subscription-file.c, 1.30, 1.31

[cras at dovecot.org]

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

Modified Files:
	subscription-file.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: subscription-file.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/subscription-file/subscription-file.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- subscription-file.c	16 Feb 2006 15:23:02 -0000	1.30
+++ subscription-file.c	26 Feb 2006 10:05:23 -0000	1.31
@@ -144,8 +144,8 @@
 	}
 
 	if (input != NULL)
-		i_stream_unref(&input);
-	o_stream_unref(&output);
+		i_stream_destroy(&input);
+	o_stream_destroy(&output);
 
 	if (failed || (set && found) || (!set && !found)) {
 		if (file_dotlock_delete(&dotlock) < 0) {
@@ -195,7 +195,7 @@
 
 	failed = ctx->failed;
 	if (ctx->input != NULL)
-		i_stream_unref(&ctx->input);
+		i_stream_destroy(&ctx->input);
 	pool_unref(ctx->pool);
 
 	return failed ? -1 : 0;
@@ -221,7 +221,7 @@
                    this isn't the optimal behavior, but it's allowed by
                    IMAP and this way we don't have to read everything into
                    memory or try to play any guessing games. */
-                i_stream_unref(&ctx->input);
+                i_stream_destroy(&ctx->input);
 
                 fd = safe_open(ctx->path, O_RDONLY);
                 if (fd == -1) {