gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new parameter validation macro

Browse Source
This commit is contained in:
Sam Lantinga
2025-09-16 21:51:03 -07:00
parent ee1c90a358
commit 25b2d2c821
60 changed files with 1113 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/io/SDL_asyncio.c
View File

@@ -42,10 +42,11 @@ static const char *AsyncFileModeValid(const char *mode)
SDL_AsyncIO *SDL_AsyncIOFromFile(const char *file, const char *mode)
{
if (!file) {
CHECK_PARAM(!file) {
SDL_InvalidParamError("file");
return NULL;
} else if (!mode) {
}
CHECK_PARAM(!mode) {
SDL_InvalidParamError("mode");
return NULL;
}
@@ -78,7 +79,7 @@ SDL_AsyncIO *SDL_AsyncIOFromFile(const char *file, const char *mode)
Sint64 SDL_GetAsyncIOSize(SDL_AsyncIO *asyncio)
{
if (!asyncio) {
CHECK_PARAM(!asyncio) {
SDL_InvalidParamError("asyncio");
return -1;
}
@@ -87,11 +88,13 @@ Sint64 SDL_GetAsyncIOSize(SDL_AsyncIO *asyncio)
static bool RequestAsyncIO(bool reading, SDL_AsyncIO *asyncio, void *ptr, Uint64 offset, Uint64 size, SDL_AsyncIOQueue *queue, void *userdata)
{
if (!asyncio) {
CHECK_PARAM(!asyncio) {
return SDL_InvalidParamError("asyncio");
} else if (!ptr) {
}
CHECK_PARAM(!ptr) {
return SDL_InvalidParamError("ptr");
} else if (!queue) {
}
CHECK_PARAM(!queue) {
return SDL_InvalidParamError("queue");
}
@@ -143,9 +146,10 @@ bool SDL_WriteAsyncIO(SDL_AsyncIO *asyncio, void *ptr, Uint64 offset, Uint64 siz
bool SDL_CloseAsyncIO(SDL_AsyncIO *asyncio, bool flush, SDL_AsyncIOQueue *queue, void *userdata)
{
if (!asyncio) {
CHECK_PARAM(!asyncio) {
return SDL_InvalidParamError("asyncio");
} else if (!queue) {
}
CHECK_PARAM(!queue) {
return SDL_InvalidParamError("queue");
}
@@ -298,9 +302,10 @@ void SDL_QuitAsyncIO(void)
bool SDL_LoadFileAsync(const char *file, SDL_AsyncIOQueue *queue, void *userdata)
{
if (!file) {
CHECK_PARAM(!file) {
return SDL_InvalidParamError("file");
} else if (!queue) {
}
CHECK_PARAM(!queue) {
return SDL_InvalidParamError("queue");
}

59
src/io/SDL_iostream.c
View File

@@ -875,11 +875,11 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
{
SDL_IOStream *iostr = NULL;
if (!file || !*file) {
CHECK_PARAM(!file || !*file) {
SDL_InvalidParamError("file");
return NULL;
}
if (!mode || !*mode) {
CHECK_PARAM(!mode || !*mode) {
SDL_InvalidParamError("mode");
return NULL;
}
@@ -991,10 +991,11 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
SDL_IOStream *SDL_IOFromMem(void *mem, size_t size)
{
if (!mem) {
CHECK_PARAM(!mem) {
SDL_InvalidParamError("mem");
return NULL;
} else if (!size) {
}
CHECK_PARAM(!size) {
SDL_InvalidParamError("size");
return NULL;
}
@@ -1032,10 +1033,11 @@ SDL_IOStream *SDL_IOFromMem(void *mem, size_t size)
SDL_IOStream *SDL_IOFromConstMem(const void *mem, size_t size)
{
if (!mem) {
CHECK_PARAM(!mem) {
SDL_InvalidParamError("mem");
return NULL;
} else if (!size) {
}
CHECK_PARAM(!size) {
SDL_InvalidParamError("size");
return NULL;
}
@@ -1178,7 +1180,7 @@ SDL_IOStream *SDL_IOFromDynamicMem(void)
SDL_IOStatus SDL_GetIOStatus(SDL_IOStream *context)
{
if (!context) {
CHECK_PARAM(!context) {
SDL_InvalidParamError("context");
return SDL_IO_STATUS_ERROR;
}
@@ -1187,11 +1189,11 @@ SDL_IOStatus SDL_GetIOStatus(SDL_IOStream *context)
SDL_IOStream *SDL_OpenIO(const SDL_IOStreamInterface *iface, void *userdata)
{
if (!iface) {
CHECK_PARAM(!iface) {
SDL_InvalidParamError("iface");
return NULL;
}
if (iface->version < sizeof(*iface)) {
CHECK_PARAM(iface->version < sizeof(*iface)) {
// Update this to handle older versions of this interface
SDL_SetError("Invalid interface, should be initialized with SDL_INIT_INTERFACE()");
return NULL;
@@ -1227,7 +1229,7 @@ void *SDL_LoadFile_IO(SDL_IOStream *src, size_t *datasize, bool closeio)
char *data = NULL, *newdata;
bool loading_chunks = false;
if (!src) {
CHECK_PARAM(!src) {
SDL_InvalidParamError("src");
goto done;
}
@@ -1308,12 +1310,12 @@ bool SDL_SaveFile_IO(SDL_IOStream *src, const void *data, size_t datasize, bool
size_t size_total = 0;
bool success = true;
if (!src) {
CHECK_PARAM(!src) {
SDL_InvalidParamError("src");
goto done;
}
if (!data && datasize > 0) {
CHECK_PARAM(!data && datasize > 0) {
SDL_InvalidParamError("data");
goto done;
}
@@ -1356,7 +1358,7 @@ bool SDL_SaveFile(const char *file, const void *data, size_t datasize)
SDL_PropertiesID SDL_GetIOProperties(SDL_IOStream *context)
{
if (!context) {
CHECK_PARAM(!context) {
SDL_InvalidParamError("context");
return 0;
}
@@ -1369,9 +1371,10 @@ SDL_PropertiesID SDL_GetIOProperties(SDL_IOStream *context)
Sint64 SDL_GetIOSize(SDL_IOStream *context)
{
if (!context) {
CHECK_PARAM(!context) {
return SDL_InvalidParamError("context");
}
if (!context->iface.size) {
Sint64 pos, size;
@@ -1389,10 +1392,12 @@ Sint64 SDL_GetIOSize(SDL_IOStream *context)
Sint64 SDL_SeekIO(SDL_IOStream *context, Sint64 offset, SDL_IOWhence whence)
{
if (!context) {
CHECK_PARAM(!context) {
SDL_InvalidParamError("context");
return -1;
} else if (!context->iface.seek) {
}
if (!context->iface.seek) {
SDL_Unsupported();
return -1;
}
@@ -1406,14 +1411,18 @@ Sint64 SDL_TellIO(SDL_IOStream *context)
size_t SDL_ReadIO(SDL_IOStream *context, void *ptr, size_t size)
{
if (!context) {
CHECK_PARAM(!context) {
SDL_InvalidParamError("context");
return 0;
} else if (!context->iface.read) {
}
if (!context->iface.read) {
context->status = SDL_IO_STATUS_WRITEONLY;
SDL_Unsupported();
return 0;
} else if (size == 0) {
}
if (size == 0) {
return 0; // context->status doesn't change for this.
}
@@ -1425,14 +1434,18 @@ size_t SDL_ReadIO(SDL_IOStream *context, void *ptr, size_t size)
size_t SDL_WriteIO(SDL_IOStream *context, const void *ptr, size_t size)
{
if (!context) {
CHECK_PARAM(!context) {
SDL_InvalidParamError("context");
return 0;
} else if (!context->iface.write) {
}
if (!context->iface.write) {
context->status = SDL_IO_STATUS_READONLY;
SDL_Unsupported();
return 0;
} else if (size == 0) {
}
if (size == 0) {
return 0; // context->status doesn't change for this.
}
@@ -1481,7 +1494,7 @@ bool SDL_FlushIO(SDL_IOStream *context)
{
bool result = true;
if (!context) {
CHECK_PARAM(!context) {
return SDL_InvalidParamError("context");
}