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

SDL API renaming: SDL_Alloc*/SDL_Free* -> SDL_Create*/SDL_Destroy*

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/6945
This commit is contained in:
Sam Lantinga
2022-12-29 15:07:59 -08:00
parent e1bd5bd071
commit 98678b5d8d
14 changed files with 84 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dynapi/SDL_dynapi.sym
View File

@@ -5,7 +5,7 @@ SDL3_0.0.0 {
SDL_AddGamepadMappingsFromRW;
SDL_AddHintCallback;
SDL_AddTimer;
SDL_AllocRW;
SDL_CreateRW;
SDL_AndroidBackButton;
SDL_AndroidGetActivity;
SDL_AndroidGetExternalStoragePath;
@@ -110,8 +110,8 @@ SDL3_0.0.0 {
SDL_FlushAudioStream;
SDL_FlushEvent;
SDL_FlushEvents;
SDL_FreeCursor;
SDL_FreeRW;
SDL_DestroyCursor;
SDL_DestroyRW;
SDL_GDKGetTaskQueue;
SDL_GDKSuspendComplete;
SDL_GL_BindTexture;

6
src/dynapi/SDL_dynapi_overrides.h
View File

@@ -31,7 +31,7 @@
#define SDL_AddGamepadMappingsFromRW SDL_AddGamepadMappingsFromRW_REAL
#define SDL_AddHintCallback SDL_AddHintCallback_REAL
#define SDL_AddTimer SDL_AddTimer_REAL
#define SDL_AllocRW SDL_AllocRW_REAL
#define SDL_CreateRW SDL_CreateRW_REAL
#define SDL_AndroidBackButton SDL_AndroidBackButton_REAL
#define SDL_AndroidGetActivity SDL_AndroidGetActivity_REAL
#define SDL_AndroidGetExternalStoragePath SDL_AndroidGetExternalStoragePath_REAL
@@ -136,8 +136,8 @@
#define SDL_FlushAudioStream SDL_FlushAudioStream_REAL
#define SDL_FlushEvent SDL_FlushEvent_REAL
#define SDL_FlushEvents SDL_FlushEvents_REAL
#define SDL_FreeCursor SDL_FreeCursor_REAL
#define SDL_FreeRW SDL_FreeRW_REAL
#define SDL_DestroyCursor SDL_DestroyCursor_REAL
#define SDL_DestroyRW SDL_DestroyRW_REAL
#define SDL_GDKGetTaskQueue SDL_GDKGetTaskQueue_REAL
#define SDL_GDKSuspendComplete SDL_GDKSuspendComplete_REAL
#define SDL_GL_BindTexture SDL_GL_BindTexture_REAL

6
src/dynapi/SDL_dynapi_procs.h
View File

@@ -121,7 +121,7 @@ SDL_DYNAPI_PROC(int,SDL_AddGamepadMapping,(const char *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_AddGamepadMappingsFromRW,(SDL_RWops *a, int b),(a,b),return)
SDL_DYNAPI_PROC(void,SDL_AddHintCallback,(const char *a, SDL_HintCallback b, void *c),(a,b,c),)
SDL_DYNAPI_PROC(SDL_TimerID,SDL_AddTimer,(Uint32 a, SDL_TimerCallback b, void *c),(a,b,c),return)
SDL_DYNAPI_PROC(SDL_RWops*,SDL_AllocRW,(void),(),return)
SDL_DYNAPI_PROC(SDL_RWops*,SDL_CreateRW,(void),(),return)
SDL_DYNAPI_PROC(int,SDL_AtomicAdd,(SDL_atomic_t *a, int b),(a,b),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_AtomicCAS,(SDL_atomic_t *a, int b, int c),(a,b,c),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_AtomicCASPtr,(void **a, void *b, void *c),(a,b,c),return)
@@ -213,8 +213,8 @@ SDL_DYNAPI_PROC(int,SDL_FlashWindow,(SDL_Window *a, SDL_FlashOperation b),(a,b),
SDL_DYNAPI_PROC(int,SDL_FlushAudioStream,(SDL_AudioStream *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_FlushEvent,(Uint32 a),(a),)
SDL_DYNAPI_PROC(void,SDL_FlushEvents,(Uint32 a, Uint32 b),(a,b),)
SDL_DYNAPI_PROC(void,SDL_FreeCursor,(SDL_Cursor *a),(a),)
SDL_DYNAPI_PROC(void,SDL_FreeRW,(SDL_RWops *a),(a),)
SDL_DYNAPI_PROC(void,SDL_DestroyCursor,(SDL_Cursor *a),(a),)
SDL_DYNAPI_PROC(void,SDL_DestroyRW,(SDL_RWops *a),(a),)
SDL_DYNAPI_PROC(int,SDL_GL_BindTexture,(SDL_Texture *a, float *b, float *c),(a,b,c),return)
SDL_DYNAPI_PROC(SDL_GLContext,SDL_GL_CreateContext,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_GL_DeleteContext,(SDL_GLContext a),(a),)

4
src/events/SDL_mouse.c
View File

@@ -883,7 +883,7 @@ void SDL_QuitMouse(void)
cursor = mouse->cursors;
while (cursor) {
next = cursor->next;
SDL_FreeCursor(cursor);
SDL_DestroyCursor(cursor);
cursor = next;
}
mouse->cursors = NULL;
@@ -1380,7 +1380,7 @@ SDL_GetDefaultCursor(void)
return mouse->def_cursor;
}
void SDL_FreeCursor(SDL_Cursor *cursor)
void SDL_DestroyCursor(SDL_Cursor *cursor)
{
SDL_Mouse *mouse = SDL_GetMouse();
SDL_Cursor *curr, *prev;

28
src/file/SDL_rwops.c
View File

@@ -276,7 +276,7 @@ static int SDLCALL windows_file_close(SDL_RWops *context)
}
SDL_free(context->hidden.windowsio.buffer.data);
context->hidden.windowsio.buffer.data = NULL;
SDL_FreeRW(context);
SDL_DestroyRW(context);
}
return 0;
}
@@ -403,7 +403,7 @@ static int SDLCALL stdio_close(SDL_RWops *context)
status = SDL_Error(SDL_EFWRITE);
}
}
SDL_FreeRW(context);
SDL_DestroyRW(context);
}
return status;
}
@@ -412,7 +412,7 @@ static SDL_RWops *SDL_RWFromFP(void *fp, SDL_bool autoclose)
{
SDL_RWops *rwops = NULL;
rwops = SDL_AllocRW();
rwops = SDL_CreateRW();
if (rwops != NULL) {
rwops->size = stdio_size;
rwops->seek = stdio_seek;
@@ -493,7 +493,7 @@ mem_writeconst(SDL_RWops *context, const void *ptr, Sint64 size)
static int SDLCALL mem_close(SDL_RWops *context)
{
if (context) {
SDL_FreeRW(context);
SDL_DestroyRW(context);
}
return 0;
}
@@ -536,13 +536,13 @@ SDL_RWFromFile(const char *file, const char *mode)
#endif /* HAVE_STDIO_H */
/* Try to open the file from the asset system */
rwops = SDL_AllocRW();
rwops = SDL_CreateRW();
if (rwops == NULL) {
return NULL; /* SDL_SetError already setup by SDL_AllocRW() */
return NULL; /* SDL_SetError already setup by SDL_CreateRW() */
}
if (Android_JNI_FileOpen(rwops, file, mode) < 0) {
SDL_FreeRW(rwops);
SDL_DestroyRW(rwops);
return NULL;
}
rwops->size = Android_JNI_FileSize;
@@ -553,13 +553,13 @@ SDL_RWFromFile(const char *file, const char *mode)
rwops->type = SDL_RWOPS_JNIFILE;
#elif defined(__WIN32__) || defined(__GDK__)
rwops = SDL_AllocRW();
rwops = SDL_CreateRW();
if (rwops == NULL) {
return NULL; /* SDL_SetError already setup by SDL_AllocRW() */
return NULL; /* SDL_SetError already setup by SDL_CreateRW() */
}
if (windows_file_open(rwops, file, mode) < 0) {
SDL_FreeRW(rwops);
SDL_DestroyRW(rwops);
return NULL;
}
rwops->size = windows_file_size;
@@ -606,7 +606,7 @@ SDL_RWFromMem(void *mem, int size)
return rwops;
}
rwops = SDL_AllocRW();
rwops = SDL_CreateRW();
if (rwops != NULL) {
rwops->size = mem_size;
rwops->seek = mem_seek;
@@ -634,7 +634,7 @@ SDL_RWFromConstMem(const void *mem, int size)
return rwops;
}
rwops = SDL_AllocRW();
rwops = SDL_CreateRW();
if (rwops != NULL) {
rwops->size = mem_size;
rwops->seek = mem_seek;
@@ -650,7 +650,7 @@ SDL_RWFromConstMem(const void *mem, int size)
}
SDL_RWops *
SDL_AllocRW(void)
SDL_CreateRW(void)
{
SDL_RWops *area;
@@ -663,7 +663,7 @@ SDL_AllocRW(void)
return area;
}
void SDL_FreeRW(SDL_RWops *area)
void SDL_DestroyRW(SDL_RWops *area)
{
SDL_free(area);
}