Added array_foreach_idx()

--HG--
branch : HEAD

diff --git a/src/lib/array.h b/src/lib/array.h
index ebfa3d487f6350ea2860090a08540960ead7aaa8..71ac7279c59f2bd6a5babf2bf34d63644d0734f6 100644 (file)
--- a/src/lib/array.h
+++ b/src/lib/array.h
@@ -77,6 +77,9 @@
             (elem)++)
 #endif
 
+#define array_foreach_idx(array, elem) \
+       ((elem) - (array)->v[0])
+
 static inline void
 array_create_from_buffer_i(struct array *array, buffer_t *buffer,
                           size_t element_size)

diff --git a/src/lib/test-array.c b/src/lib/test-array.c
index 419e35dc28f9f312541a9ac27674556bbdc2a18d..f63a4a232e166e330e4416030f36b81b1b995bf6 100644 (file)
--- a/src/lib/test-array.c
+++ b/src/lib/test-array.c
@@ -3,6 +3,33 @@
 #include "test-lib.h"
 #include "array.h"
 
+struct foo {
+       unsigned int a, b, c;
+};
+
+static void test_array_foreach(void)
+{
+       ARRAY_DEFINE(foos, struct foo);
+       const struct foo *foo;
+       struct foo nfoo;
+       unsigned int i;
+
+       test_begin("array foreach");
+       t_array_init(&foos, 32);
+       for (i = 0; i < 10; i++) {
+               nfoo.a = nfoo.b = nfoo.c = i;
+               array_append(&foos, &nfoo, 1);
+       }
+
+       array_foreach(&foos, foo) {
+               i = array_foreach_idx(&foos, foo);
+               test_assert(foo->a == i);
+               test_assert(foo->b == i);
+               test_assert(foo->c == i);
+       }
+       test_end();
+}
+
 static void test_array_reverse(void)
 {
        ARRAY_DEFINE(intarr, int);
@@ -26,5 +53,6 @@ static void test_array_reverse(void)
 
 void test_array(void)
 {
+       test_array_foreach();
        test_array_reverse();
 }