diff --git a/src/mapping.c b/src/mapping.c index 1c39fdc2fc3b2b49cda0b6922a08c9045b50caf7..f9f658a3371ce65a321baaf00d1c6a98fbd79f4f 100644 --- a/src/mapping.c +++ b/src/mapping.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: mapping.c,v 1.54 2000/01/31 03:24:05 hubbe Exp $"); +RCSID("$Id: mapping.c,v 1.55 2000/01/31 21:26:59 hubbe Exp $"); #include "main.h" #include "object.h" #include "mapping.h" @@ -156,7 +156,7 @@ static void init_mapping(struct mapping *m, INT32 size) /* This function allocates an empty mapping with room for 'size' values */ -struct mapping *allocate_mapping(int size) +struct mapping *debug_allocate_mapping(int size) { struct mapping *m; @@ -258,6 +258,7 @@ static struct mapping *rehash(struct mapping *m, int new_size) #endif init_mapping(m, new_size); + debug_malloc_touch(m); for(e=0;e<md->hashsize;e++) mapping_rehash_backwards(m->data, md->hash[e]); diff --git a/src/mapping.h b/src/mapping.h index c73c98413c822934ae3a4af4602fc9e677c5b27c..0830ad542d2ea9eef180a978597e0a71d7c1559b 100644 --- a/src/mapping.h +++ b/src/mapping.h @@ -5,7 +5,7 @@ \*/ /* - * $Id: mapping.h,v 1.17 2000/01/27 23:18:25 hubbe Exp $ + * $Id: mapping.h,v 1.18 2000/01/31 21:27:00 hubbe Exp $ */ #ifndef MAPPING_H #define MAPPING_H @@ -64,7 +64,7 @@ extern struct mapping *first_mapping; #define free_mapping_data(M) do{ struct mapping_data *md_=(M); debug_malloc_touch(md_); if(!--md_->refs) really_free_mapping_data(md_); }while(0) /* Prototypes begin here */ -struct mapping *allocate_mapping(int size); +struct mapping *debug_allocate_mapping(int size); void really_free_mapping(struct mapping *m); void really_free_mapping_data(struct mapping_data *md); void mapping_fix_type_field(struct mapping *m); @@ -133,3 +133,6 @@ void count_memory_in_mappings(INT32 *num_, INT32 *size_); struct mapping_data *copy_mapping_data(struct mapping_data *md); /* Prototypes end here */ #endif + +#define allocate_mapping(X) dmalloc_touch(struct mapping *,debug_allocate_mapping(X)) +