Removed __PHYSFS_platformSetDefaultAllocator(); nothing uses it now.

We can pull it back from revision control if something needs it later.
This commit is contained in:
Ryan C. Gordon 2017-07-11 23:52:13 -04:00
parent 0be0e3fd33
commit c2c1c7ac30
8 changed files with 6 additions and 62 deletions

View File

@ -3002,14 +3002,11 @@ static void mallocAllocatorFree(void *ptr)
static void setDefaultAllocator(void)
{
assert(!externalAllocator);
if (!__PHYSFS_platformSetDefaultAllocator(&allocator))
{
allocator.Init = NULL;
allocator.Deinit = NULL;
allocator.Malloc = mallocAllocatorMalloc;
allocator.Realloc = mallocAllocatorRealloc;
allocator.Free = mallocAllocatorFree;
} /* if */
allocator.Init = NULL;
allocator.Deinit = NULL;
allocator.Malloc = mallocAllocatorMalloc;
allocator.Realloc = mallocAllocatorRealloc;
allocator.Free = mallocAllocatorFree;
} /* setDefaultAllocator */
/* end of physfs.c ... */

View File

@ -655,20 +655,6 @@ int __PHYSFS_platformGrabMutex(void *mutex);
*/
void __PHYSFS_platformReleaseMutex(void *mutex);
/*
* Called at the start of PHYSFS_init() to prepare the allocator, if the user
* hasn't selected their own allocator via PHYSFS_setAllocator().
* If the platform has a custom allocator, it should fill in the fields of
* (a) with the proper function pointers and return non-zero.
* If the platform just wants to use malloc()/free()/etc, return zero
* immediately and the higher level will handle it. The Init and Deinit
* fields of (a) are optional...set them to NULL if you don't need them.
* Everything else must be implemented. All rules follow those for
* PHYSFS_setAllocator(). If Init isn't NULL, it will be called shortly
* after this function returns non-zero.
*/
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a);
#ifdef __cplusplus
}
#endif

View File

@ -227,12 +227,6 @@ void __PHYSFS_platformReleaseMutex(void *mutex)
((BLocker *) mutex)->Unlock();
} /* __PHYSFS_platformReleaseMutex */
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
{
return 0; /* just use malloc() and friends. */
} /* __PHYSFS_platformSetDefaultAllocator */
#endif /* PHYSFS_PLATFORM_BEOS */
/* end of beos.cpp ... */

View File

@ -212,12 +212,6 @@ char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app)
return retval;
} /* __PHYSFS_platformCalcPrefDir */
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
{
return 0; /* just use malloc() and friends. */
} /* __PHYSFS_platformSetDefaultAllocator */
#endif /* PHYSFS_PLATFORM_MACOSX */
/* end of macosx.c ... */

View File

@ -773,13 +773,6 @@ void __PHYSFS_platformReleaseMutex(void *mutex)
DosReleaseMutexSem((HMTX) mutex);
} /* __PHYSFS_platformReleaseMutex */
/* !!! FIXME: Don't use C runtime for allocators? */
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
{
return 0; /* just use malloc() and friends. */
} /* __PHYSFS_platformSetDefaultAllocator */
#endif /* PHYSFS_PLATFORM_OS2 */
/* end of os2.c ... */

View File

@ -367,12 +367,6 @@ char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app)
return retval;
} /* __PHYSFS_platformCalcPrefDir */
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
{
return 0; /* just use malloc() and friends. */
} /* __PHYSFS_platformSetDefaultAllocator */
#endif /* PHYSFS_PLATFORM_UNIX */
/* end of unix.c ... */

View File

@ -945,13 +945,6 @@ int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st)
return 1;
} /* __PHYSFS_platformStat */
/* !!! FIXME: Don't use C runtime for allocators? */
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
{
return 0; /* just use malloc() and friends. */
} /* __PHYSFS_platformSetDefaultAllocator */
#endif /* PHYSFS_PLATFORM_WINDOWS */
#endif /* PHYSFS_PLATFORM_WINRT */

View File

@ -665,12 +665,5 @@ int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st)
return 1;
} /* __PHYSFS_platformStat */
#endif /* PHYSFS_PLATFORM_WINRT */
/* !!! FIXME: Don't use C runtime for allocators? */
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a)
{
return 0; /* just use malloc() and friends. */
} /* __PHYSFS_platformSetDefaultAllocator */
#endif /* PHYSFS_PLATFORM_WINRT */