mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-11 13:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed SDL_bool in favor of plain bool

Browse Source 
We require stdbool.h in the build environment, so we might as well use the plain bool type.

If your environment doesn't have stdbool.h, this simple replacement will suffice:
typedef signed char bool;
This commit is contained in:
Sam Lantinga
2024-09-18 07:52:28 -07:00
parent 9dd8859240
commit a90ad3b0e2
258 changed files with 4052 additions and 4057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/file/SDL_iostream.c
View File

@@ -275,7 +275,7 @@ static size_t SDLCALL windows_file_write(void *userdata, const void *ptr, size_t
return bytes;
}
static SDL_bool SDLCALL windows_file_close(void *userdata)
static bool SDLCALL windows_file_close(void *userdata)
{
IOStreamWindowsData *iodata = (IOStreamWindowsData *) userdata;
if (iodata->h != INVALID_HANDLE_VALUE) {
@@ -451,7 +451,7 @@ static size_t SDLCALL stdio_write(void *userdata, const void *ptr, size_t size,
return bytes;
}
static SDL_bool SDLCALL stdio_flush(void *userdata, SDL_IOStatus *status)
static bool SDLCALL stdio_flush(void *userdata, SDL_IOStatus *status)
{
IOStreamStdioData *iodata = (IOStreamStdioData *) userdata;
if (fflush(iodata->fp) != 0) {
@@ -465,7 +465,7 @@ static SDL_bool SDLCALL stdio_flush(void *userdata, SDL_IOStatus *status)
return true;
}
static SDL_bool SDLCALL stdio_close(void *userdata)
static bool SDLCALL stdio_close(void *userdata)
{
IOStreamStdioData *iodata = (IOStreamStdioData *) userdata;
bool status = true;
@@ -583,7 +583,7 @@ static size_t SDLCALL mem_write(void *userdata, const void *ptr, size_t size, SD
return mem_io(userdata, iodata->here, ptr, size);
}
static SDL_bool SDLCALL mem_close(void *userdata)
static bool SDLCALL mem_close(void *userdata)
{
SDL_free(userdata);
return true;
@@ -851,7 +851,7 @@ static size_t SDLCALL dynamic_mem_write(void *userdata, const void *ptr, size_t
return mem_io(&iodata->data, iodata->data.here, ptr, size);
}
static SDL_bool SDLCALL dynamic_mem_close(void *userdata)
static bool SDLCALL dynamic_mem_close(void *userdata)
{
const IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) userdata;
void *mem = SDL_GetPointerProperty(SDL_GetIOProperties(iodata->stream), SDL_PROP_IOSTREAM_DYNAMIC_MEMORY_POINTER, NULL);
@@ -915,7 +915,7 @@ SDL_IOStream *SDL_OpenIO(const SDL_IOStreamInterface *iface, void *userdata)
return iostr;
}
SDL_bool SDL_CloseIO(SDL_IOStream *iostr)
bool SDL_CloseIO(SDL_IOStream *iostr)
{
bool result = true;
if (iostr) {
@@ -929,7 +929,7 @@ SDL_bool SDL_CloseIO(SDL_IOStream *iostr)
}
// Load all the data from an SDL data stream
void *SDL_LoadFile_IO(SDL_IOStream *src, size_t *datasize, SDL_bool closeio)
void *SDL_LoadFile_IO(SDL_IOStream *src, size_t *datasize, bool closeio)
{
const int FILE_CHUNK_SIZE = 1024;
Sint64 size, size_total = 0;
@@ -1148,7 +1148,7 @@ size_t SDL_IOvprintf(SDL_IOStream *context, SDL_PRINTF_FORMAT_STRING const char
return bytes;
}
SDL_bool SDL_FlushIO(SDL_IOStream *context)
bool SDL_FlushIO(SDL_IOStream *context)
{
bool result = true;
@@ -1170,7 +1170,7 @@ SDL_bool SDL_FlushIO(SDL_IOStream *context)
// Functions for dynamically reading and writing endian-specific values
SDL_bool SDL_ReadU8(SDL_IOStream *src, Uint8 *value)
bool SDL_ReadU8(SDL_IOStream *src, Uint8 *value)
{
Uint8 data = 0;
bool result = false;
@@ -1184,7 +1184,7 @@ SDL_bool SDL_ReadU8(SDL_IOStream *src, Uint8 *value)
return result;
}
SDL_bool SDL_ReadS8(SDL_IOStream *src, Sint8 *value)
bool SDL_ReadS8(SDL_IOStream *src, Sint8 *value)
{
Sint8 data = 0;
bool result = false;
@@ -1198,7 +1198,7 @@ SDL_bool SDL_ReadS8(SDL_IOStream *src, Sint8 *value)
return result;
}
SDL_bool SDL_ReadU16LE(SDL_IOStream *src, Uint16 *value)
bool SDL_ReadU16LE(SDL_IOStream *src, Uint16 *value)
{
Uint16 data = 0;
bool result = false;
@@ -1212,12 +1212,12 @@ SDL_bool SDL_ReadU16LE(SDL_IOStream *src, Uint16 *value)
return result;
}
SDL_bool SDL_ReadS16LE(SDL_IOStream *src, Sint16 *value)
bool SDL_ReadS16LE(SDL_IOStream *src, Sint16 *value)
{
return SDL_ReadU16LE(src, (Uint16 *)value);
}
SDL_bool SDL_ReadU16BE(SDL_IOStream *src, Uint16 *value)
bool SDL_ReadU16BE(SDL_IOStream *src, Uint16 *value)
{
Uint16 data = 0;
bool result = false;
@@ -1231,12 +1231,12 @@ SDL_bool SDL_ReadU16BE(SDL_IOStream *src, Uint16 *value)
return result;
}
SDL_bool SDL_ReadS16BE(SDL_IOStream *src, Sint16 *value)
bool SDL_ReadS16BE(SDL_IOStream *src, Sint16 *value)
{
return SDL_ReadU16BE(src, (Uint16 *)value);
}
SDL_bool SDL_ReadU32LE(SDL_IOStream *src, Uint32 *value)
bool SDL_ReadU32LE(SDL_IOStream *src, Uint32 *value)
{
Uint32 data = 0;
bool result = false;
@@ -1250,12 +1250,12 @@ SDL_bool SDL_ReadU32LE(SDL_IOStream *src, Uint32 *value)
return result;
}
SDL_bool SDL_ReadS32LE(SDL_IOStream *src, Sint32 *value)
bool SDL_ReadS32LE(SDL_IOStream *src, Sint32 *value)
{
return SDL_ReadU32LE(src, (Uint32 *)value);
}
SDL_bool SDL_ReadU32BE(SDL_IOStream *src, Uint32 *value)
bool SDL_ReadU32BE(SDL_IOStream *src, Uint32 *value)
{
Uint32 data = 0;
bool result = false;
@@ -1269,12 +1269,12 @@ SDL_bool SDL_ReadU32BE(SDL_IOStream *src, Uint32 *value)
return result;
}
SDL_bool SDL_ReadS32BE(SDL_IOStream *src, Sint32 *value)
bool SDL_ReadS32BE(SDL_IOStream *src, Sint32 *value)
{
return SDL_ReadU32BE(src, (Uint32 *)value);
}
SDL_bool SDL_ReadU64LE(SDL_IOStream *src, Uint64 *value)
bool SDL_ReadU64LE(SDL_IOStream *src, Uint64 *value)
{
Uint64 data = 0;
bool result = false;
@@ -1288,12 +1288,12 @@ SDL_bool SDL_ReadU64LE(SDL_IOStream *src, Uint64 *value)
return result;
}
SDL_bool SDL_ReadS64LE(SDL_IOStream *src, Sint64 *value)
bool SDL_ReadS64LE(SDL_IOStream *src, Sint64 *value)
{
return SDL_ReadU64LE(src, (Uint64 *)value);
}
SDL_bool SDL_ReadU64BE(SDL_IOStream *src, Uint64 *value)
bool SDL_ReadU64BE(SDL_IOStream *src, Uint64 *value)
{
Uint64 data = 0;
bool result = false;
@@ -1307,83 +1307,83 @@ SDL_bool SDL_ReadU64BE(SDL_IOStream *src, Uint64 *value)
return result;
}
SDL_bool SDL_ReadS64BE(SDL_IOStream *src, Sint64 *value)
bool SDL_ReadS64BE(SDL_IOStream *src, Sint64 *value)
{
return SDL_ReadU64BE(src, (Uint64 *)value);
}
SDL_bool SDL_WriteU8(SDL_IOStream *dst, Uint8 value)
bool SDL_WriteU8(SDL_IOStream *dst, Uint8 value)
{
return (SDL_WriteIO(dst, &value, sizeof(value)) == sizeof(value));
}
SDL_bool SDL_WriteS8(SDL_IOStream *dst, Sint8 value)
bool SDL_WriteS8(SDL_IOStream *dst, Sint8 value)
{
return (SDL_WriteIO(dst, &value, sizeof(value)) == sizeof(value));
}
SDL_bool SDL_WriteU16LE(SDL_IOStream *dst, Uint16 value)
bool SDL_WriteU16LE(SDL_IOStream *dst, Uint16 value)
{
const Uint16 swapped = SDL_Swap16LE(value);
return (SDL_WriteIO(dst, &swapped, sizeof(swapped)) == sizeof(swapped));
}
SDL_bool SDL_WriteS16LE(SDL_IOStream *dst, Sint16 value)
bool SDL_WriteS16LE(SDL_IOStream *dst, Sint16 value)
{
return SDL_WriteU16LE(dst, (Uint16)value);
}
SDL_bool SDL_WriteU16BE(SDL_IOStream *dst, Uint16 value)
bool SDL_WriteU16BE(SDL_IOStream *dst, Uint16 value)
{
const Uint16 swapped = SDL_Swap16BE(value);
return (SDL_WriteIO(dst, &swapped, sizeof(swapped)) == sizeof(swapped));
}
SDL_bool SDL_WriteS16BE(SDL_IOStream *dst, Sint16 value)
bool SDL_WriteS16BE(SDL_IOStream *dst, Sint16 value)
{
return SDL_WriteU16BE(dst, (Uint16)value);
}
SDL_bool SDL_WriteU32LE(SDL_IOStream *dst, Uint32 value)
bool SDL_WriteU32LE(SDL_IOStream *dst, Uint32 value)
{
const Uint32 swapped = SDL_Swap32LE(value);
return (SDL_WriteIO(dst, &swapped, sizeof(swapped)) == sizeof(swapped));
}
SDL_bool SDL_WriteS32LE(SDL_IOStream *dst, Sint32 value)
bool SDL_WriteS32LE(SDL_IOStream *dst, Sint32 value)
{
return SDL_WriteU32LE(dst, (Uint32)value);
}
SDL_bool SDL_WriteU32BE(SDL_IOStream *dst, Uint32 value)
bool SDL_WriteU32BE(SDL_IOStream *dst, Uint32 value)
{
const Uint32 swapped = SDL_Swap32BE(value);
return (SDL_WriteIO(dst, &swapped, sizeof(swapped)) == sizeof(swapped));
}
SDL_bool SDL_WriteS32BE(SDL_IOStream *dst, Sint32 value)
bool SDL_WriteS32BE(SDL_IOStream *dst, Sint32 value)
{
return SDL_WriteU32BE(dst, (Uint32)value);
}
SDL_bool SDL_WriteU64LE(SDL_IOStream *dst, Uint64 value)
bool SDL_WriteU64LE(SDL_IOStream *dst, Uint64 value)
{
const Uint64 swapped = SDL_Swap64LE(value);
return (SDL_WriteIO(dst, &swapped, sizeof(swapped)) == sizeof(swapped));
}
SDL_bool SDL_WriteS64LE(SDL_IOStream *dst, Sint64 value)
bool SDL_WriteS64LE(SDL_IOStream *dst, Sint64 value)
{
return SDL_WriteU64LE(dst, (Uint64)value);
}
SDL_bool SDL_WriteU64BE(SDL_IOStream *dst, Uint64 value)
bool SDL_WriteU64BE(SDL_IOStream *dst, Uint64 value)
{
const Uint64 swapped = SDL_Swap64BE(value);
return (SDL_WriteIO(dst, &swapped, sizeof(swapped)) == sizeof(swapped));
}
SDL_bool SDL_WriteS64BE(SDL_IOStream *dst, Sint64 value)
bool SDL_WriteS64BE(SDL_IOStream *dst, Sint64 value)
{
return SDL_WriteU64BE(dst, (Uint64)value);
}