[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-mail.c, 1.20, 1.21

[tss-movial at dovecot.org]

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

Modified Files:
	maildir-mail.c 
Log Message:
Cleanup



Index: maildir-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-mail.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- maildir-mail.c	18 Jan 2006 22:16:42 -0000	1.20
+++ maildir-mail.c	6 Mar 2006 16:42:10 -0000	1.21
@@ -93,8 +93,7 @@
 			return (time_t)-1;
 		}
 	} else {
-		if (maildir_file_do(mbox, mail->mail.mail.uid,
-				    do_stat, &st) <= 0)
+		if (maildir_file_do(mbox, _mail->uid, do_stat, &st) <= 0)
 			return (time_t)-1;
 	}
 
@@ -122,8 +121,7 @@
 			return data->virtual_size;
 	}
 
-	fname = maildir_uidlist_lookup(mbox->uidlist,
-				       mail->mail.mail.uid, &flags);
+	fname = maildir_uidlist_lookup(mbox->uidlist, _mail->uid, &flags);
 	if (fname == NULL)
 		return (uoff_t)-1;
 
@@ -159,7 +157,7 @@
 
 	if (field == MAIL_FETCH_UIDL_FILE_NAME) {
 	    	fname = maildir_uidlist_lookup(mbox->uidlist,
-					       mail->mail.mail.uid, &flags);
+					       _mail->uid, &flags);
 		end = strchr(fname, MAILDIR_INFO_SEP);
 		return end == NULL ? fname : t_strdup_until(fname, end);
 	}
@@ -181,8 +179,7 @@
 	if (size != (uoff_t)-1)
 		return size;
 
-	fname = maildir_uidlist_lookup(mbox->uidlist,
-				       mail->mail.mail.uid, &flags);
+	fname = maildir_uidlist_lookup(mbox->uidlist, _mail->uid, &flags);
 	if (fname == NULL)
 		return (uoff_t)-1;
 
@@ -202,8 +199,7 @@
 	}
 
 	if (size == (uoff_t)-1) {
-		if (maildir_file_do(mbox, mail->mail.mail.uid,
-				    do_stat, &st) <= 0)
+		if (maildir_file_do(mbox, _mail->uid, do_stat, &st) <= 0)
 			return (uoff_t)-1;
 		size = st.st_size;
 	}
@@ -225,8 +221,7 @@
 	bool deleted;
 
 	if (data->stream == NULL) {
-		data->stream = maildir_open_mail(mbox,
-						 mail->mail.mail.uid, &deleted);
+		data->stream = maildir_open_mail(mbox, _mail->uid, &deleted);
 		if (data->stream == NULL) {
 			_mail->expunged = deleted;
 			return NULL;