vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: common: zone: implement dummy Q_realloc for XASH_CUSTOM_SWAP

Browse source
This commit is contained in:
Alibek Omarov 2024-04-18 18:54:34 +03:00
parent ca3b4a9d7f
commit 9ec1caed53
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
engine/common/zone.c
View file

@ -25,9 +25,30 @@ GNU General Public License for more details.
#include "platform/swap/swap.h" #include "platform/swap/swap.h"
#define Q_malloc SWAP_Malloc #define Q_malloc SWAP_Malloc
#define Q_free SWAP_Free #define Q_free SWAP_Free
static void *Q_realloc( void *mem, size_t size )
{
void *newmem;
if( mem && size == 0 )
{
Q_free( mem );
return NULL;
}
newmem = Q_malloc( size );
if( mem && newmem )
{
memcpy( newmem, mem, size );
Q_free( mem );
}
return newmem;
}
#else #else
#define Q_malloc malloc #define Q_malloc malloc
#define Q_free free #define Q_free free
#define Q_realloc realloc
#endif #endif
typedef struct memheader_s typedef struct memheader_s
@ -276,21 +297,10 @@ void *_Mem_Realloc( poolhandle_t poolptr, void *data, size_t size, qboolean clea
if( size == oldsize ) if( size == oldsize )
return data; return data;
#if XASH_CUSTOM_SWAP
{
char *nb = _Mem_Alloc( poolptr, size, clear, filename, fileline );
size_t newsize = mem->size < size ? mem->size : size; // upper data can be trucnated!
memcpy( nb, data, newsize );
_Mem_Free( data, filename, fileline ); // free unused old block
return nb;
}
#else // XASH_CUSTOM_SWAP
pool = Mem_FindPool( poolptr ); pool = Mem_FindPool( poolptr );
oldmem = (uintptr_t)mem; oldmem = (uintptr_t)mem;
mem = realloc( mem, sizeof( memheader_t ) + size + sizeof( byte )); mem = Q_realloc( mem, sizeof( memheader_t ) + size + sizeof( byte ));
if( mem == NULL ) if( mem == NULL )
{ {
@ -327,7 +337,6 @@ void *_Mem_Realloc( poolhandle_t poolptr, void *data, size_t size, qboolean clea
} }
return (void *)((byte *)mem + sizeof( memheader_t )); return (void *)((byte *)mem + sizeof( memheader_t ));
#endif // XASH_CUSTOM_SWAP
} }
poolhandle_t _Mem_AllocPool( const char *name, const char *filename, int fileline ) poolhandle_t _Mem_AllocPool( const char *name, const char *filename, int fileline )
@ -353,7 +362,7 @@ poolhandle_t _Mem_AllocPool( const char *name, const char *filename, int filelin
Q_strncpy( pool->name, name, sizeof( pool->name )); Q_strncpy( pool->name, name, sizeof( pool->name ));
pool->next = poolchain; pool->next = poolchain;
poolchain = pool; poolchain = pool;
#if XASH_64BIT #if XASH_64BIT
pool->idx = ++lastidx; pool->idx = ++lastidx;
return pool->idx; return pool->idx;