dovecot-2.2: Code cleanup: Use array_count_i() to calculate arra...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/2f776ca73cef
changeset: 14526:2f776ca73cef
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Apr 28 18:24:24 2012 +0300
description:
Code cleanup: Use array_count_i() to calculate array's size internally.

diffstat:

 src/lib/aqueue.c |   6 ++----
 src/lib/array.c  |   6 +++---
 src/lib/array.h  |  20 ++++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diffs (104 lines):

diff -r 629afda8e29d -r 2f776ca73cef src/lib/aqueue.c
--- a/src/lib/aqueue.c	Sat Apr 28 17:41:14 2012 +0300
+++ b/src/lib/aqueue.c	Sat Apr 28 18:24:24 2012 +0300
@@ -10,8 +10,7 @@
 
 	aqueue = i_new(struct aqueue, 1);
 	aqueue->arr = array;
-	aqueue->area_size = buffer_get_size(aqueue->arr->buffer) /
-		aqueue->arr->element_size;
+	aqueue->area_size = array_count_i(array);
 	i_assert(aqueue->area_size > 0);
 	return aqueue;
 }
@@ -32,8 +31,7 @@
 
 	orig_area_size = aqueue->area_size;
 	(void)array_append_space_i(aqueue->arr);
-	aqueue->area_size = buffer_get_size(aqueue->arr->buffer) /
-		aqueue->arr->element_size;
+	aqueue->area_size = array_count_i(aqueue->arr);
 	i_assert(orig_area_size < aqueue->area_size);
 
 	count = I_MIN(aqueue->area_size - orig_area_size, aqueue->head);
diff -r 629afda8e29d -r 2f776ca73cef src/lib/array.c
--- a/src/lib/array.c	Sat Apr 28 17:41:14 2012 +0300
+++ b/src/lib/array.c	Sat Apr 28 18:24:24 2012 +0300
@@ -71,7 +71,7 @@
 
 void array_reverse_i(struct array *array)
 {
-	const unsigned int element_size = array->element_size;
+	const size_t element_size = array->element_size;
 	unsigned int i, count = array_count_i(array);
 	size_t size;
 	void *data, *tmp;
@@ -92,7 +92,7 @@
 {
 	unsigned int count;
 
-	count = array->buffer->used / array->element_size;
+	count = array_count_i(array);
 	qsort(buffer_get_modifiable_data(array->buffer, NULL),
 	      count, array->element_size, cmp);
 }
@@ -102,7 +102,7 @@
 {
 	unsigned int count;
 
-	count = array->buffer->used / array->element_size;
+	count = array_count_i(array);
 	return bsearch(key, array->buffer->data,
 		       count, array->element_size, cmp);
 }
diff -r 629afda8e29d -r 2f776ca73cef src/lib/array.h
--- a/src/lib/array.h	Sat Apr 28 17:41:14 2012 +0300
+++ b/src/lib/array.h	Sat Apr 28 18:24:24 2012 +0300
@@ -134,6 +134,14 @@
 #define array_clear(array) \
 	array_clear_i(&(array)->arr)
 
+static inline unsigned int ATTR_PURE
+array_count_i(const struct array *array)
+{
+	return array->buffer->used / array->element_size;
+}
+#define array_count(array) \
+	array_count_i(&(array)->arr)
+
 static inline void
 array_append_i(struct array *array, const void *data, unsigned int count)
 {
@@ -177,7 +185,7 @@
 static inline const void *
 array_get_i(const struct array *array, unsigned int *count_r)
 {
-	*count_r = array->buffer->used / array->element_size;
+	*count_r = array_count_i(array);
 	return array->buffer->data;
 }
 #define array_get(array, count) \
@@ -195,7 +203,7 @@
 static inline void *
 array_get_modifiable_i(struct array *array, unsigned int *count_r)
 {
-	*count_r = array->buffer->used / array->element_size;
+	*count_r = array_count_i(array);
 	return buffer_get_modifiable_data(array->buffer, NULL);
 }
 #define array_get_modifiable(array, count) \
@@ -244,14 +252,6 @@
 		    count * dest->element_size);
 }
 
-static inline unsigned int ATTR_PURE
-array_count_i(const struct array *array)
-{
-	return array->buffer->used / array->element_size;
-}
-#define array_count(array) \
-	array_count_i(&(array)->arr)
-
 bool array_cmp_i(const struct array *array1,
 		 const struct array *array2) ATTR_PURE;
 #define array_cmp(array1, array2) \