quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround safe_*alloc size print on error (was negative due to %i format specifier for size_t)

Browse Source
This commit is contained in:
Garux 2020-01-23 07:25:12 +03:00
parent 2d839e524f
commit 0bc1a2a280
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/quake3/common/cmdlib.c
View File

@ -51,10 +51,11 @@
#define PATHSEPERATOR '/' #define PATHSEPERATOR '/'
#ifdef SAFE_MALLOC #ifdef SAFE_MALLOC
// FIXME switch to -std=c99 or above to use proper %zu format specifier for size_t
void *safe_malloc( size_t size ){ void *safe_malloc( size_t size ){
void *p = malloc( size ); void *p = malloc( size );
if ( !p ) { if ( !p ) {
Error( "safe_malloc failed on allocation of %i bytes", size ); Error( "safe_malloc failed on allocation of %lu bytes", (unsigned long)size );
} }
return p; return p;
} }
@ -62,7 +63,7 @@ void *safe_malloc( size_t size ){
void *safe_malloc_info( size_t size, const char* info ){ void *safe_malloc_info( size_t size, const char* info ){
void *p = malloc( size ); void *p = malloc( size );
if ( !p ) { if ( !p ) {
Error( "%s: safe_malloc failed on allocation of %i bytes", info, size ); Error( "%s: safe_malloc failed on allocation of %lu bytes", info, (unsigned long)size );
} }
return p; return p;
} }
@ -70,7 +71,7 @@ void *safe_malloc_info( size_t size, const char* info ){
void *safe_calloc( size_t size ){ void *safe_calloc( size_t size ){
void *p = calloc( 1, size ); void *p = calloc( 1, size );
if ( !p ) { if ( !p ) {
Error( "safe_calloc failed on allocation of %i bytes", size ); Error( "safe_calloc failed on allocation of %lu bytes", (unsigned long)size );
} }
return p; return p;
} }
@ -78,7 +79,7 @@ void *safe_calloc( size_t size ){
void *safe_calloc_info( size_t size, const char* info ){ void *safe_calloc_info( size_t size, const char* info ){
void *p = calloc( 1, size ); void *p = calloc( 1, size );
if ( !p ) { if ( !p ) {
Error( "%s: safe_calloc failed on allocation of %i bytes", info, size ); Error( "%s: safe_calloc failed on allocation of %lu bytes", info, (unsigned long)size );
} }
return p; return p;
} }