X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=285facca38ea9a8f0920aa3b2e8e0bffb9dd3a22;hb=fe0d5dc2d85167fb8042bcb5157e93728e74e53a;hp=f1417350b1f946931a1f440b848bd683c13d3774;hpb=ac723954c7b1d01de519a8dc64a55a30faf6edb9;p=xonotic%2Fdarkplaces.git

diff --git a/zone.h b/zone.h
index f1417350..285facca 100644
--- a/zone.h
+++ b/zone.h
@@ -52,7 +52,7 @@ typedef struct memheader_s
 	struct memclump_s *clump;
 #endif
 	// size of the memory after the header (excluding header and sentinel2)
-	int size;
+	size_t size;
 	// file name and line where Mem_Alloc was called
 	const char *filename;
 	int fileline;
@@ -66,7 +66,7 @@ memheader_t;
 typedef struct memclump_s
 {
 	// contents of the clump
-	qbyte block[MEMCLUMPSIZE];
+	unsigned char block[MEMCLUMPSIZE];
 	// should always be MEMCLUMP_SENTINEL
 	unsigned int sentinel1;
 	// if a bit is on, it means that the MEMUNIT bytes it represents are
@@ -75,10 +75,10 @@ typedef struct memclump_s
 	// should always be MEMCLUMP_SENTINEL
 	unsigned int sentinel2;
 	// if this drops to 0, the clump is freed
-	int blocksinuse;
+	size_t blocksinuse;
 	// largest block of memory available (this is reset to an optimistic
 	// number when anything is freed, and updated when alloc fails the clump)
-	int largestavailable;
+	size_t largestavailable;
 	// next clump in the chain
 	struct memclump_s *chain;
 }
@@ -98,13 +98,11 @@ typedef struct mempool_s
 	// POOLFLAG_*
 	int flags;
 	// total memory allocated in this pool (inside memheaders)
-	int totalsize;
+	size_t totalsize;
 	// total memory allocated in this pool (actual malloc total)
-	int realsize;
+	size_t realsize;
 	// updated each time the pool is displayed by memlist, shows change from previous time (unless pool was freed)
-	int lastchecksize;
-	// name of the pool
-	char name[POOLNAMESIZE];
+	size_t lastchecksize;
 	// linked into global mempool list
 	struct mempool_s *next;
 	// parent object (used for nested memory pools)
@@ -112,6 +110,8 @@ typedef struct mempool_s
 	// file name and line where Mem_AllocPool was called
 	const char *filename;
 	int fileline;
+	// name of the pool
+	char name[POOLNAMESIZE];
 	// should always be MEMHEADER_SENTINEL1
 	unsigned int sentinel2;
 }
@@ -125,19 +125,21 @@ 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, const char *filename, int fileline);
+void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int fileline);
 void _Mem_Free(void *data, const char *filename, int fileline);
 mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, 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);
+// if pool is NULL this searches ALL pools for the allocation
 qboolean Mem_IsAllocated(mempool_t *pool, void *data);
 
 // used for temporary allocations
-mempool_t *tempmempool;
+extern mempool_t *tempmempool;
 
 void Memory_Init (void);
+void Memory_Shutdown (void);
 void Memory_Init_Commands (void);
 
 extern mempool_t *zonemempool;