[dovecot-cvs] dovecot/src/lib file-dotlock.c,1.35.2.3,1.35.2.4

tss at dovecot.org tss at dovecot.org
Sat Mar 17 17:28:09 EET 2007


Update of /var/lib/cvs/dovecot/src/lib
In directory talvi:/tmp/cvs-serv1153

Modified Files:
      Tag: branch_1_0
	file-dotlock.c 
Log Message:
Log "kept it for n seconds", not -n seconds.



Index: file-dotlock.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/file-dotlock.c,v
retrieving revision 1.35.2.3
retrieving revision 1.35.2.4
diff -u -d -r1.35.2.3 -r1.35.2.4
--- file-dotlock.c	8 Jun 2006 16:13:46 -0000	1.35.2.3
+++ file-dotlock.c	17 Mar 2007 15:28:07 -0000	1.35.2.4
@@ -555,7 +555,7 @@
 		if (errno == ENOENT) {
 			i_warning("Our dotlock file %s was deleted "
 				  "(kept it %d secs)", lock_path,
-				  (int)(dotlock->lock_time - time(NULL)));
+				  (int)(time(NULL) - dotlock->lock_time));
 			file_dotlock_free(dotlock);
 			return 0;
 		}
@@ -580,14 +580,14 @@
 			  "assuming it wasn't overridden (kept it %d secs)",
 			  lock_path,
 			  dec2str(dotlock->mtime), dec2str(st.st_mtime),
-			  (int)(dotlock->lock_time - time(NULL)));
+			  (int)(time(NULL) - dotlock->lock_time));
 	}
 
 	if (unlink(lock_path) < 0) {
 		if (errno == ENOENT) {
 			i_warning("Our dotlock file %s was deleted "
 				  "(kept it %d secs)", lock_path,
-				  (int)(dotlock->lock_time - time(NULL)));
+				  (int)(time(NULL) - dotlock->lock_time));
 			file_dotlock_free(dotlock);
 			return 0;
 		}
@@ -657,7 +657,7 @@
 		    !CMP_DEV_T(st.st_dev, st2.st_dev)) {
 			i_warning("Our dotlock file %s was overridden "
 				  "(kept it %d secs)", lock_path,
-				  (int)(dotlock->lock_time - time(NULL)));
+				  (int)(time(NULL) - dotlock->lock_time));
 			errno = EEXIST;
 			file_dotlock_free(dotlock);
 			return 0;



More information about the dovecot-cvs mailing list