The following commit has been merged in the master branch: commit f896bd9280543d0e35f45d3fd404bf9dba0e46d0 Author: Sven Eckelmann sven@narfation.org Date: Sat May 14 23:14:49 2011 +0200

batman-adv: Don't do pointer arithmetic with void*

The size of void is currently set by gcc to 1, but is not well defined in general. Therefore it is more advisable to cast it to char* before doing pointer arithmetic.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/originator.c b/originator.c index 080ec88..9843b68 100644 --- a/originator.c +++ b/originator.c @@ -567,7 +567,7 @@ static int orig_node_del_if(struct orig_node *orig_node, memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);

/* copy second part */ - memcpy(data_ptr + del_if_num * chunk_size, + memcpy((char *)data_ptr + del_if_num * chunk_size, orig_node->bcast_own + ((del_if_num + 1) * chunk_size), (max_if_num - del_if_num) * chunk_size);

@@ -587,7 +587,7 @@ free_bcast_own: memcpy(data_ptr, orig_node->bcast_own_sum, del_if_num * sizeof(uint8_t));

- memcpy(data_ptr + del_if_num * sizeof(uint8_t), + memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)), (max_if_num - del_if_num) * sizeof(uint8_t));