[dovecot-cvs] dovecot/src/lib-storage/subscription-file subscription-file.c, 1.23, 1.24

[cras at procontrol.fi]

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

Modified Files:
	subscription-file.c 
Log Message:
file_dotlock_open/delete/replace now has lock_suffix parameter. NULL
defaults to ".lock".

Fixed dotlocking transaction log.



Index: subscription-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/subscription-file/subscription-file.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- subscription-file.c	27 Apr 2004 20:25:55 -0000	1.23
+++ subscription-file.c	3 May 2004 22:08:26 -0000	1.24
@@ -79,7 +79,8 @@
 		name = "INBOX";
 
 	/* FIXME: set lock notification callback */
-	fd_out = file_dotlock_open(path, NULL, SUBSCRIPTION_FILE_LOCK_TIMEOUT,
+	fd_out = file_dotlock_open(path, NULL, NULL,
+				   SUBSCRIPTION_FILE_LOCK_TIMEOUT,
 				   SUBSCRIPTION_FILE_CHANGE_TIMEOUT,
 				   SUBSCRIPTION_FILE_IMMEDIATE_TIMEOUT,
 				   NULL, NULL);
@@ -97,7 +98,7 @@
 	fd_in = open(path, O_RDONLY);
 	if (fd_in == -1 && errno != ENOENT) {
 		subsfile_set_syscall_error(storage, "open()", path);
-		file_dotlock_delete(path, fd_out);
+		file_dotlock_delete(path, NULL, fd_out);
 		return -1;
 	}
 
@@ -137,13 +138,13 @@
 	o_stream_unref(output);
 
 	if (failed || (set && found) || (!set && !found)) {
-		if (file_dotlock_delete(path, fd_out) < 0) {
+		if (file_dotlock_delete(path, NULL, fd_out) < 0) {
 			subsfile_set_syscall_error(storage,
 				"file_dotlock_delete()", path);
 			failed = TRUE;
 		}
 	} else {
-		if (file_dotlock_replace(path, fd_out, TRUE) < 0) {
+		if (file_dotlock_replace(path, NULL, fd_out, TRUE) < 0) {
 			subsfile_set_syscall_error(storage,
 				"file_dotlock_replace()", path);
 			failed = TRUE;