common: Move infostring functions to new com_infostring.c

[xonotic/darkplaces.git] / zone.h

diff --git a/zone.h b/zone.h
index a78372267114d9a61836774fd566914b674c3d6e..3dec0b62b961e3d4e4da026721d753588554ccfe 100644 (file)
--- a/zone.h
+++ b/zone.h
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stddef.h>
 #include "qtypes.h"
 #include "qdefs.h"
+#include "com_list.h"
 
 extern qbool mem_bigendian;
 
@@ -39,8 +40,7 @@ typedef struct memheader_s
        // address returned by Chunk_Alloc (may be significantly before this header to satisify alignment)
        void *baseaddress;
        // next and previous memheaders in chain belonging to pool
-       struct memheader_s *next;
-       struct memheader_s *prev;
+       struct llist_s list;
        // pool this memheader belongs to
        struct mempool_s *pool;
        // size of the memory after the header (excluding header and sentinel2)
@@ -59,7 +59,7 @@ typedef struct mempool_s
        // should always be MEMPOOL_SENTINEL
        unsigned int sentinel1;
        // chain of individual memory allocations
-       struct memheader_s *chain;
+       struct llist_s chain;
        // POOLFLAG_*
        int flags;
        // total memory allocated in this pool (inside memheaders)
@@ -86,6 +86,7 @@ mempool_t;
 #define Mem_Memalign(pool,alignment,size) _Mem_Alloc(pool, NULL, size, alignment, __FILE__, __LINE__)
 #define Mem_Realloc(pool,data,size) _Mem_Alloc(pool, data, size, 16, __FILE__, __LINE__)
 #define Mem_Free(mem) _Mem_Free(mem, __FILE__, __LINE__)
+#define Mem_strdup(pool, s) _Mem_strdup(pool, s, __FILE__, __LINE__)
 #define Mem_CheckSentinels(data) _Mem_CheckSentinels(data, __FILE__, __LINE__)
 #if MEMPARANOIA
 #define Mem_CheckSentinelsGlobal()  _Mem_CheckSentinelsGlobal(__FILE__, __LINE__)
@@ -106,7 +107,7 @@ void _Mem_CheckSentinelsGlobal(const char *filename, int fileline);
 // if pool is NULL this searches ALL pools for the allocation
 qbool Mem_IsAllocated(mempool_t *pool, void *data);
 
-char* Mem_strdup (mempool_t *pool, const char* s);
+char* _Mem_strdup (mempool_t *pool, const char* s, const char *filename, int fileline);
 
 typedef struct memexpandablearray_array_s
 {