dovecot-2.2: quota: The new quota counting code was counting onl...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/08725018dedd
changeset: 19248:08725018dedd
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 28 16:17:13 2015 +0300
description:
quota: The new quota counting code was counting only the last mailbox.

diffstat:

 src/plugins/quota/quota-count.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r f2c25d5b6280 -r 08725018dedd src/plugins/quota/quota-count.c
--- a/src/plugins/quota/quota-count.c	Mon Sep 28 16:15:00 2015 +0300
+++ b/src/plugins/quota/quota-count.c	Mon Sep 28 16:17:13 2015 +0300
@@ -17,7 +17,7 @@
 
 static int
 quota_count_mailbox(struct quota_root *root, struct mail_namespace *ns,
-		    const char *vname, uint64_t *bytes_r, uint64_t *count_r)
+		    const char *vname, uint64_t *bytes, uint64_t *count)
 {
 	struct quota_rule *rule;
 	struct mailbox *box;
@@ -50,9 +50,9 @@
 		}
 	} else {
 		ret = 1;
-		*bytes_r = root->quota->set->vsizes ?
+		*bytes += root->quota->set->vsizes ?
 			metadata.virtual_size : metadata.physical_size;
-		*count_r = status.messages;
+		*count += status.messages;
 	}
 	mailbox_free(&box);
 	return ret;