[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-sync.c, 1.2, 1.3 maildir-uidlist.c, 1.3, 1.4

[cras at procontrol.fi]

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

Modified Files:
	maildir-sync.c maildir-uidlist.c 
Log Message:
fixes



Index: maildir-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-sync.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maildir-sync.c	28 Apr 2004 00:21:01 -0000	1.2
+++ maildir-sync.c	1 May 2004 14:30:25 -0000	1.3
@@ -132,7 +132,6 @@
 		ibox->commit_log_file_seq = 0;
 		ibox->commit_log_file_offset = 0;
 	} else {
-		// FIXME: this is bad - we have to fix this in some way
 		mail_storage_set_index_error(ibox);
 	}
 	return ret;
@@ -307,7 +306,7 @@
 
 	if (mail_index_sync_begin(ibox->index, &sync_ctx, &view,
 				  (uint32_t)-1, (uoff_t)-1) <= 0) {
-		// FIXME: ?
+		mail_storage_set_index_error(ibox);
 		return -1;
 	}
 
@@ -393,7 +392,6 @@
 		ibox->commit_log_file_seq = 0;
 		ibox->commit_log_file_offset = 0;
 	} else {
-		// FIXME: this is bad - we have to fix this in some way
 		mail_storage_set_index_error(ibox);
 	}
 

Index: maildir-uidlist.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maildir-uidlist.c	28 Apr 2004 23:24:37 -0000	1.3
+++ maildir-uidlist.c	1 May 2004 14:30:25 -0000	1.4
@@ -570,11 +570,9 @@
 {
 	int ret;
 
-	if (ctx->failed) {
-		if (UIDLIST_IS_LOCKED(ctx->uidlist))
-			maildir_uidlist_unlock(ctx->uidlist);
+	if (ctx->failed)
 		ret = -1;
-	} else {
+	else {
 		maildir_uidlist_swap(ctx);
 		if (!ctx->new_files)
 			ret = 0;
@@ -582,6 +580,9 @@
 			ret = maildir_uidlist_rewrite(ctx->uidlist);
 	}
 
+	if (UIDLIST_IS_LOCKED(ctx->uidlist))
+		maildir_uidlist_unlock(ctx->uidlist);
+
 	if (ctx->files != NULL)
 		hash_destroy(ctx->files);
 	if (ctx->filename_pool != NULL)