Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fix compiler issues with non-C99 conforming compilers 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@960 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-01-05 18:00:46 +00:00
parent c89cadfb97
commit c898c17ecb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/framework/mem.c
View File

@ -243,6 +243,12 @@ void *memMallocRelease(size_t Size)
*/
void memFree(const char *pFileName, SDWORD LineNumber, void *pMemToFree)
{
MEM_NODE sNode, *psDeleted;
UWORD i, InvalidBottom, InvalidTop;
UBYTE *pMemBase;
BLOCK_HEAP *psBlock;
ASSERT( (pFileName != NULL), "No filename passed to memFree" );
ASSERT( (pMemToFree != NULL), "Attempt to free NULL pointer, called by:\n"
"File: %s\nLine: %d\n", pFileName, LineNumber );
@ -250,7 +256,7 @@ void memFree(const char *pFileName, SDWORD LineNumber, void *pMemToFree)
if (pMemToFree == NULL) return;
// see if the pointer was allocated in a block
BLOCK_HEAP *psBlock = blkFind(pMemToFree);
psBlock = blkFind(pMemToFree);
if (psBlock != NULL)
{
// use a block heap rather than normal free
@ -261,13 +267,11 @@ void memFree(const char *pFileName, SDWORD LineNumber, void *pMemToFree)
// Create a dummy node for the search
// This is only looked at by memBlockCmp so only need to set the object and size
MEM_NODE sNode;
sNode.pObj = ((UBYTE *)pMemToFree) - sizeof(MEM_NODE) - SAFETY_ZONE_SIZE;
sNode.size = 1;
/* Get the node for the memory block */
MEM_NODE* psDeleted = (MEM_NODE *)treapDelRec((TREAP_NODE **)&psMemRoot,
psDeleted = (MEM_NODE *)treapDelRec((TREAP_NODE **)&psMemRoot,
(void*)&sNode, memBlockCmp);
@ -279,8 +283,8 @@ void memFree(const char *pFileName, SDWORD LineNumber, void *pMemToFree)
if (psDeleted)
{
/* The pointer is valid, check the buffer zones */
UBYTE* pMemBase = (UBYTE *)(pMemToFree) - SAFETY_ZONE_SIZE;
UWORD InvalidBottom = 0, InvalidTop = 0, i = 0;
pMemBase = (UBYTE *)(pMemToFree) - SAFETY_ZONE_SIZE;
InvalidBottom = InvalidTop = 0;
// Check wether out of bound writes have occured since memMalloc()
for(i=0; i<SAFETY_ZONE_SIZE; i++)