X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=d4abe16d4ee90518991a6bb696f09574a0c72fbb;hb=e5004f482e1e5ff6c17e6b9252a0ff1381ce90db;hp=9cdd9ff93e8620c259cd0f032094c5d453f1a13c;hpb=ce3be9028e11deb62fc4998791a02ed6b1f92895;p=xonotic%2Fdarkplaces.git

diff --git a/zone.h b/zone.h
index 9cdd9ff9..d4abe16d 100644
--- a/zone.h
+++ b/zone.h
@@ -40,8 +40,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct memheader_s
 {
-	// next memheader in chain belonging to pool
-	struct memheader_s *chain;
+	// next and previous memheaders in chain belonging to pool
+	struct memheader_s *next;
+	struct memheader_s *prev;
 	// pool this memheader belongs to
 	struct mempool_s *pool;
 #if MEMCLUMPING
@@ -51,10 +52,10 @@ typedef struct memheader_s
 	// size of the memory after the header (excluding header and sentinel2)
 	int size;
 	// file name and line where Mem_Alloc was called
-	char *filename;
+	const char *filename;
 	int fileline;
 	// should always be MEMHEADER_SENTINEL1
-	int sentinel1;
+	unsigned int sentinel1;
 	// immediately followed by data, which is followed by a MEMHEADER_SENTINEL2 byte
 }
 memheader_t;
@@ -65,12 +66,12 @@ typedef struct memclump_s
 	// contents of the clump
 	qbyte block[MEMCLUMPSIZE];
 	// should always be MEMCLUMP_SENTINEL
-	int sentinel1;
+	unsigned int sentinel1;
 	// if a bit is on, it means that the MEMUNIT bytes it represents are
 	// allocated, otherwise free
 	int bits[MEMBITINTS];
 	// should always be MEMCLUMP_SENTINEL
-	int sentinel2;
+	unsigned int sentinel2;
 	// if this drops to 0, the clump is freed
 	int blocksinuse;
 	// largest block of memory available (this is reset to an optimistic
@@ -84,6 +85,8 @@ memclump_t;
 
 typedef struct mempool_s
 {
+	// should always be MEMHEADER_SENTINEL1
+	unsigned int sentinel1;
 	// chain of individual memory allocations
 	struct memheader_s *chain;
 #if MEMCLUMPING
@@ -100,6 +103,11 @@ typedef struct mempool_s
 	char name[POOLNAMESIZE];
 	// linked into global mempool list
 	struct mempool_s *next;
+	// file name and line where Mem_AllocPool was called
+	const char *filename;
+	int fileline;
+	// should always be MEMHEADER_SENTINEL1
+	unsigned int sentinel2;
 }
 mempool_t;
 
@@ -111,13 +119,13 @@ mempool_t;
 #define Mem_FreePool(pool) _Mem_FreePool(pool, __FILE__, __LINE__)
 #define Mem_EmptyPool(pool) _Mem_EmptyPool(pool, __FILE__, __LINE__)
 
-void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline);
-void _Mem_Free(void *data, char *filename, int fileline);
-mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline);
-void _Mem_FreePool(mempool_t **pool, char *filename, int fileline);
-void _Mem_EmptyPool(mempool_t *pool, char *filename, int fileline);
-void _Mem_CheckSentinels(void *data, char *filename, int fileline);
-void _Mem_CheckSentinelsGlobal(char *filename, int fileline);
+void *_Mem_Alloc(mempool_t *pool, int size, const char *filename, int fileline);
+void _Mem_Free(void *data, const char *filename, int fileline);
+mempool_t *_Mem_AllocPool(const char *name, const char *filename, int fileline);
+void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline);
+void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline);
+void _Mem_CheckSentinels(void *data, const char *filename, int fileline);
+void _Mem_CheckSentinelsGlobal(const char *filename, int fileline);
 
 // used for temporary allocations
 mempool_t *tempmempool;