[dovecot-cvs] dovecot/src/lib-index/mbox mbox-lock.c,1.16,1.17 mbox-sync.c,1.24,1.25

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index/mbox
In directory danu:/tmp/cvs-serv31291/src/lib-index/mbox

Modified Files:
	mbox-lock.c mbox-sync.c 
Log Message:
Added CMP_DEV_T macro which uses major()/minor() if possible but fallbacks
to direct comparing if it's not a structure.



Index: mbox-lock.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-lock.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mbox-lock.c	26 Nov 2002 18:47:43 -0000	1.16
+++ mbox-lock.c	26 Nov 2002 19:01:24 -0000	1.17
@@ -274,8 +274,7 @@
 
 	/* make sure it's still our dotlock */
 	if (old_ino != st.st_ino ||
-	    major(old_dev) != major(st.st_dev) ||
-	    minor(old_dev) != minor(st.st_dev)) {
+	    !CMP_DEV_T(old_dev, st.st_dev)) {
 		index_set_error(index,
 			"Warning: Our dotlock file %s was overridden", path);
 		return FALSE;

Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-sync.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mbox-sync.c	26 Nov 2002 18:47:43 -0000	1.24
+++ mbox-sync.c	26 Nov 2002 19:01:24 -0000	1.25
@@ -109,8 +109,7 @@
 	filesize = st.st_size;
 
 	if (index->mbox_ino != st.st_ino ||
-	    major(index->mbox_dev) != major(st.st_dev) ||
-	    minor(index->mbox_dev) != minor(st.st_dev)) {
+            !CMP_DEV_T(index->mbox_dev, st.st_dev)) {
 		/* mbox file was overwritten, close it if it was open */
 		index->mbox_dev = st.st_dev;
 		index->mbox_ino = st.st_ino;