[dovecot-cvs] dovecot/src/imap imap-fetch-body.c, 1.6, 1.7 imap-sort.c, 1.14, 1.15

[cras at dovecot.org]

Update of /home/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv21625/imap

Modified Files:
	imap-fetch-body.c imap-sort.c 
Log Message:
Added mail.get_physical_size().



Index: imap-fetch-body.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/imap-fetch-body.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imap-fetch-body.c	23 Aug 2004 15:29:07 -0000	1.6
+++ imap-fetch-body.c	28 Aug 2004 10:32:16 -0000	1.7
@@ -759,7 +759,7 @@
 {
 	uoff_t size;
 
-	size = mail->get_size(mail);
+	size = mail->get_virtual_size(mail);
 	if (size == (uoff_t)-1)
 		return -1;
 
@@ -858,7 +858,7 @@
 	}
 
 	if (strcmp(arg+6, ".SIZE") == 0) {
-		ctx->fetch_data |= MAIL_FETCH_SIZE;
+		ctx->fetch_data |= MAIL_FETCH_VIRTUAL_SIZE;
 		imap_fetch_add_handler(ctx, fetch_rfc822_size, NULL);
 		return TRUE;
 	}

Index: imap-sort.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/imap-sort.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- imap-sort.c	18 Jul 2004 02:25:06 -0000	1.14
+++ imap-sort.c	28 Aug 2004 10:32:16 -0000	1.15
@@ -143,7 +143,7 @@
 	if (ctx->cache_mask & MAIL_SORT_DATE)
 		fields |= MAIL_FETCH_DATE;
 	if (ctx->cache_mask & MAIL_SORT_SIZE)
-		fields |= MAIL_FETCH_SIZE;
+		fields |= MAIL_FETCH_VIRTUAL_SIZE;
 
 	/* @UNSAFE */
 	i_assert(MAX_WANTED_HEADERS > 4);
@@ -349,7 +349,7 @@
 	}
 
 	if (ctx->common_mask & MAIL_SORT_SIZE) {
-		size = mail->get_size(mail);
+		size = mail->get_virtual_size(mail);
 		if (size != ctx->last_size) {
 			ctx->last_size = size;
 			changed = TRUE;
@@ -425,7 +425,7 @@
 		if (ctx->common_mask & MAIL_SORT_SIZE)
 			size = ctx->last_size;
 		else
-			size = mail->get_size(mail);
+			size = mail->get_virtual_size(mail);
 
 		memcpy(buf + pos, &size, sizeof(size)); pos += sizeof(size);
 	}
@@ -554,7 +554,7 @@
 
 		i_assert(type == MAIL_SORT_SIZE);
 
-		return mail->get_size(mail);
+		return mail->get_virtual_size(mail);
 	}
 
 	/* use memcpy() to avoid any alignment problems */