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

SDL_AddGamepadMappingsFromFile() has been made into a real function

Browse Source
This commit is contained in:
Sam Lantinga
2023-07-18 12:05:04 -07:00
parent dfc6e8825e
commit 75e7a6fcfa
5 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/joystick/SDL_gamepad.c
View File

@@ -1661,7 +1661,7 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMapping(SDL_JoystickID instance_id
/*
* Add or update an entry into the Mappings Database
*/
int SDL_AddGamepadMappingsFromRW(SDL_RWops *rw, int freerw)
int SDL_AddGamepadMappingsFromRW(SDL_RWops *src, int freesrc)
{
const char *platform = SDL_GetPlatform();
int gamepads = 0;
@@ -1669,29 +1669,29 @@ int SDL_AddGamepadMappingsFromRW(SDL_RWops *rw, int freerw)
Sint64 db_size;
size_t platform_len;
if (rw == NULL) {
return SDL_SetError("Invalid RWops");
if (src == NULL) {
return SDL_InvalidParamError("src");
}
db_size = SDL_RWsize(rw);
db_size = SDL_RWsize(src);
buf = (char *)SDL_malloc((size_t)db_size + 1);
if (buf == NULL) {
if (freerw) {
SDL_RWclose(rw);
if (freesrc) {
SDL_RWclose(src);
}
return SDL_SetError("Could not allocate space to read DB into memory");
}
if (SDL_RWread(rw, buf, db_size) != db_size) {
if (freerw) {
SDL_RWclose(rw);
if (SDL_RWread(src, buf, db_size) != db_size) {
if (freesrc) {
SDL_RWclose(src);
}
SDL_free(buf);
return SDL_SetError("Could not read DB");
}
if (freerw) {
SDL_RWclose(rw);
if (freesrc) {
SDL_RWclose(src);
}
buf[db_size] = '\0';
@@ -1733,6 +1733,11 @@ int SDL_AddGamepadMappingsFromRW(SDL_RWops *rw, int freerw)
return gamepads;
}
int SDL_AddGamepadMappingsFromFile(const char *file)
{
return SDL_AddGamepadMappingsFromRW(SDL_RWFromFile(file, "rb"), 1);
}
/*
* Add or update an entry into the Mappings Database with a priority
*/