changeset 4088:43a03c8a6f01 HEAD

Cleanup
author Timo Sirainen <timo.sirainen@movial.fi>
date Mon, 06 Mar 2006 18:42:10 +0200
parents 61fc347bcceb
children 029dd4ab2765
files src/lib-storage/index/maildir/maildir-mail.c
diffstat 1 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/maildir/maildir-mail.c	Mon Mar 06 17:48:33 2006 +0200
+++ b/src/lib-storage/index/maildir/maildir-mail.c	Mon Mar 06 18:42:10 2006 +0200
@@ -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;