From e481c75404de0ae029fe9752d8b91c0afb39765e Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 14 Aug 2020 01:56:08 -0700 Subject: [PATCH] Use SDL stdlib funcs for free/malloc/strcmp It's always good to have less of a dependency on a libc. --- desktop_version/src/BinaryBlob.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/BinaryBlob.cpp b/desktop_version/src/BinaryBlob.cpp index a8e94825..36bb9697 100644 --- a/desktop_version/src/BinaryBlob.cpp +++ b/desktop_version/src/BinaryBlob.cpp @@ -27,7 +27,7 @@ void binaryBlob::AddFileToBinaryBlob(const char* _path) size = ftell(file); fseek(file, 0, SEEK_SET); - memblock = (char*) malloc(size); + memblock = (char*) SDL_malloc(size); fread(memblock, 1, size, file); fclose(file); @@ -110,7 +110,7 @@ bool binaryBlob::unPackBinary(const char* name) } PHYSFS_seek(handle, offset); - m_memblocks[i] = (char*) malloc(m_headers[i].size); + m_memblocks[i] = (char*) SDL_malloc(m_headers[i].size); if (m_memblocks[i] == NULL) { exit(1); /* Oh god we're out of memory, just bail */ @@ -141,7 +141,7 @@ void binaryBlob::clear() { if (m_headers[i].valid) { - free(m_memblocks[i]); + SDL_free(m_memblocks[i]); m_headers[i].valid = false; } } @@ -151,7 +151,7 @@ int binaryBlob::getIndex(const char* _name) { for (size_t i = 0; i < SDL_arraysize(m_headers); i += 1) { - if (strcmp(_name, m_headers[i].name) == 0 && m_headers[i].valid) + if (SDL_strcmp(_name, m_headers[i].name) == 0 && m_headers[i].valid) { return i; } @@ -185,7 +185,7 @@ std::vector binaryBlob::getExtra() for (size_t i = 0; i < SDL_arraysize(m_headers); i += 1) { if (m_headers[i].valid -#define FOREACH_TRACK(track_name) && strcmp(m_headers[i].name, track_name) != 0 +#define FOREACH_TRACK(track_name) && SDL_strcmp(m_headers[i].name, track_name) != 0 TRACK_NAMES #undef FOREACH_TRACK ) {