dovecot-2.1: aqueue: Reversed recent changes, they didn't work a...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/99a30e40dce9
changeset: 14493:99a30e40dce9
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 01 03:01:49 2012 +0300
description:
aqueue: Reversed recent changes, they didn't work as intended.

diffstat:

 src/lib/aqueue.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 6c381b3e0a3d -r 99a30e40dce9 src/lib/aqueue.c
--- a/src/lib/aqueue.c	Mon Apr 30 23:04:08 2012 +0300
+++ b/src/lib/aqueue.c	Tue May 01 03:01:49 2012 +0300
@@ -10,7 +10,8 @@
 
 	aqueue = i_new(struct aqueue, 1);
 	aqueue->arr = array;
-	aqueue->area_size = array_count_i(array);
+	aqueue->area_size = buffer_get_size(aqueue->arr->buffer) /
+		aqueue->arr->element_size;
 	i_assert(aqueue->area_size > 0);
 	return aqueue;
 }
@@ -31,7 +32,8 @@
 
 	orig_area_size = aqueue->area_size;
 	(void)array_append_space_i(aqueue->arr);
-	aqueue->area_size = array_count_i(aqueue->arr);
+	aqueue->area_size = buffer_get_size(aqueue->arr->buffer) /
+		aqueue->arr->element_size;
 	i_assert(orig_area_size < aqueue->area_size);
 
 	count = I_MIN(aqueue->area_size - orig_area_size, aqueue->head);