add two missing functions

[xonotic/darkplaces.git] / zone.h

diff --git a/zone.h b/zone.h
index a71916c01eb051eef386c07b26af1ed3b0573bbb..a4f852dc1c5143e22567acc0caa77a2ab43f0920 100644 (file)
--- a/zone.h
+++ b/zone.h
@@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // LordHavoc: this is pointless with a good C library
 //#define MEMCLUMPING
 
-#define POOLNAMESIZE 128
-// if set this pool will be printed in memlist reports
-#define POOLFLAG_TEMP 1
+// div0: heap overflow detection paranoia
+//#define MEMPARANOIA 1
+
 #if MEMCLUMPING
 // give malloc padding so we can't waste most of a page at the end
 #define MEMCLUMPSIZE (65536 - 1536)
@@ -34,11 +34,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MEMUNIT 8
 #define MEMBITS (MEMCLUMPSIZE / MEMUNIT)
 #define MEMBITINTS (MEMBITS / 32)
-#define MEMCLUMP_SENTINEL 0xABADCAFE
 #endif
 
-#define MEMHEADER_SENTINEL1 0xDEADF00D
-#define MEMHEADER_SENTINEL2 0xDF
+#define POOLNAMESIZE 128
+// if set this pool will be printed in memlist reports
+#define POOLFLAG_TEMP 1
 
 typedef struct memheader_s
 {
@@ -135,14 +135,7 @@ 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);
 
-static char* Mem_strdup (mempool_t *pool, const char* s)
-{
-       char* p;
-       if (s == NULL) return NULL;
-       p = (char*)Mem_Alloc (pool, strlen (s) + 1);
-       strcpy (p, s);
-       return p;
-}
+char* Mem_strdup (mempool_t *pool, const char* s);
 
 typedef struct memexpandablearray_array_s
 {
@@ -167,8 +160,8 @@ void Mem_ExpandableArray_NewArray(memexpandablearray_t *l, mempool_t *mempool, s
 void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l);
 void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l);
 void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record);
-size_t Mem_ExpandableArray_IndexRange(memexpandablearray_t *l);
-void *Mem_ExpandableArray_RecordAtIndex(memexpandablearray_t *l, size_t index);
+size_t Mem_ExpandableArray_IndexRange(const memexpandablearray_t *l) DP_FUNC_PURE;
+void *Mem_ExpandableArray_RecordAtIndex(const memexpandablearray_t *l, size_t index) DP_FUNC_PURE;
 
 // used for temporary allocations
 extern mempool_t *tempmempool;