From 7e81b0b0e989779327ccf6917a358bc5c71ac83b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christophe=20Thi=C3=A9ry?= Date: Mon, 18 Apr 2011 11:05:36 +0200 Subject: [PATCH] xbt_dynar_map did not work well with dynars of structs. Also remove a useless memcpy. --- src/xbt/dynar.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index 52d11fbada..51d207b14a 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -676,12 +676,13 @@ XBT_INLINE void xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst) static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op) { - char elm[SIZEOF_MAX]; + char *const data = (char *) dynar->data; + const unsigned long elmsize = dynar->elmsize; const unsigned long used = dynar->used; - unsigned long i = 0; + unsigned long i; for (i = 0; i < used; i++) { - _xbt_dynar_get_elm(elm, dynar, i); + char* elm = (char*) data + i * elmsize; (*op) (elm); } } -- 2.20.1