From f425f051dbced0b072d105d2bcc65eb4bf600b9e Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 14 Aug 2017 13:57:57 -0400 Subject: [PATCH] Little tweaks to __PHYSFS_initSmallAlloc(). --- src/physfs.c | 8 ++++---- src/physfs_internal.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/physfs.c b/src/physfs.c index d2248653..ed80eb6d 100644 --- a/src/physfs.c +++ b/src/physfs.c @@ -3040,7 +3040,7 @@ int __PHYSFS_readAll(PHYSFS_Io *io, void *buf, const PHYSFS_uint64 len) } /* __PHYSFS_readAll */ -void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len) +void *__PHYSFS_initSmallAlloc(void *ptr, const size_t len) { void *useHeap = ((ptr == NULL) ? ((void *) 1) : ((void *) 0)); if (useHeap) /* too large for stack allocation or alloca() failed. */ @@ -3049,8 +3049,8 @@ void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len) if (ptr != NULL) { void **retval = (void **) ptr; - /*printf("%s alloc'd (%d) bytes at (%p).\n", - useHeap ? "heap" : "stack", (int) len, ptr);*/ + /*printf("%s alloc'd (%lld) bytes at (%p).\n", + useHeap ? "heap" : "stack", (long long) len, ptr);*/ *retval = useHeap; return retval + 1; } /* if */ @@ -3064,7 +3064,7 @@ void __PHYSFS_smallFree(void *ptr) if (ptr != NULL) { void **block = ((void **) ptr) - 1; - const int useHeap = (*block != 0); + const int useHeap = (*block != NULL); if (useHeap) allocator.Free(block); /*printf("%s free'd (%p).\n", useHeap ? "heap" : "stack", block);*/ diff --git a/src/physfs_internal.h b/src/physfs_internal.h index 195c5440..2b8a465a 100644 --- a/src/physfs_internal.h +++ b/src/physfs_internal.h @@ -145,7 +145,7 @@ int __PHYSFS_ATOMIC_DECR(int *ptrval); * NEVER forget to check for NULL...allocation can fail here, of course! */ #define __PHYSFS_SMALLALLOCTHRESHOLD 256 -void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len); +void *__PHYSFS_initSmallAlloc(void *ptr, const size_t len); #define __PHYSFS_smallAlloc(bytes) ( \ __PHYSFS_initSmallAlloc( \