The following commit has been merged in the master branch: commit 4c63479cc9a076b4ffa5450d4bc449d91ba18f9e Author: Marek Lindner lindner_marek@yahoo.de Date: Fri Mar 9 15:19:26 2007 +0100
hash integration completed
diff --git a/allocate.h b/allocate.h index 91ca752..979e9b5 100644 --- a/allocate.h +++ b/allocate.h @@ -19,7 +19,7 @@
#ifndef _ALLOCATE_H -#define _ALLOCATE_H 1 +#define _ALLOCATE_H 1 #include <stdint.h>
@@ -30,16 +30,4 @@ void *debugMalloc(uint32_t length, int32_t tag); void *debugRealloc(void *memory, uint32_t length, int32_t tag); void debugFree(void *memoryParameter, int32_t tag);
-enum { - TAG_HASH=0, - TAG_HASH_TABLE, - TAG_HASH_BUCKET, - TAG_HASH_ITER, - TAG_HASH_ALLOC_FAILED, - TAG_HASH_BUCKET_REMOVE, - TAG_HASH_DELETE, - TAG_HASH_ITER_REMOVE, - - -}; #endif diff --git a/batman.c b/batman.c index c853253..a064718 100644 --- a/batman.c +++ b/batman.c @@ -1080,7 +1080,7 @@ void send_vis_packet() if(cnt >= size) { size += step; - packet = debugRealloc(packet, size * sizeof(unsigned char), 14); + packet = debugRealloc(packet, size * sizeof(unsigned char), 113); } memmove(&packet[cnt], (unsigned char*)&orig_node->orig,4); *(packet + cnt + 4) = (unsigned char) orig_node->router->packet_count;