mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-12 14:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

iostream: Final fixes before merging.

Browse Source 
- SDL_GetRWProperties -> SDL_GetIOProperties
- SDL_GetRWStatus -> SDL_GetIOStatus
- Some documentation corrections and improvements.
This commit is contained in:
Ryan C. Gordon
2024-03-15 15:34:29 -04:00
parent c175eb488c
commit b7cda16613
5 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dynapi/SDL_dynapi.sym
View File

@@ -878,7 +878,7 @@ SDL3_0.0.0 {
SDL_GetJoystickProperties;
SDL_GetRendererProperties;
SDL_GetTextureProperties;
SDL_GetRWProperties;
SDL_GetIOProperties;
SDL_GetSensorProperties;
SDL_GetSurfaceProperties;
SDL_GetWindowProperties;
@@ -978,7 +978,7 @@ SDL3_0.0.0 {
SDL_ShowOpenFolderDialog;
SDL_OpenIO;
SDL_CloseIO;
SDL_GetRWStatus;
SDL_GetIOStatus;
# extra symbols go here (don't modify this line)
local: *;
};

4
src/dynapi/SDL_dynapi_overrides.h
View File

@@ -903,7 +903,7 @@
#define SDL_GetJoystickProperties SDL_GetJoystickProperties_REAL
#define SDL_GetRendererProperties SDL_GetRendererProperties_REAL
#define SDL_GetTextureProperties SDL_GetTextureProperties_REAL
#define SDL_GetRWProperties SDL_GetRWProperties_REAL
#define SDL_GetIOProperties SDL_GetIOProperties_REAL
#define SDL_GetSensorProperties SDL_GetSensorProperties_REAL
#define SDL_GetSurfaceProperties SDL_GetSurfaceProperties_REAL
#define SDL_GetWindowProperties SDL_GetWindowProperties_REAL
@@ -1003,4 +1003,4 @@
#define SDL_ShowOpenFolderDialog SDL_ShowOpenFolderDialog_REAL
#define SDL_OpenIO SDL_OpenIO_REAL
#define SDL_CloseIO SDL_CloseIO_REAL
#define SDL_GetRWStatus SDL_GetRWStatus_REAL
#define SDL_GetIOStatus SDL_GetIOStatus_REAL

4
src/dynapi/SDL_dynapi_procs.h
View File

@@ -937,7 +937,7 @@ SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetGamepadProperties,(SDL_Gamepad *a),(a),r
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetJoystickProperties,(SDL_Joystick *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetRendererProperties,(SDL_Renderer *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetTextureProperties,(SDL_Texture *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetRWProperties,(SDL_IOStream *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetIOProperties,(SDL_IOStream *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetSensorProperties,(SDL_Sensor *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetSurfaceProperties,(SDL_Surface *a),(a),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetWindowProperties,(SDL_Window *a),(a),return)
@@ -1028,4 +1028,4 @@ SDL_DYNAPI_PROC(void,SDL_ShowSaveFileDialog,(SDL_DialogFileCallback a, void *b,
SDL_DYNAPI_PROC(void,SDL_ShowOpenFolderDialog,(SDL_DialogFileCallback a, void *b, SDL_Window *c, const char *d, int e),(a,b,c,d,e),)
SDL_DYNAPI_PROC(SDL_IOStream*,SDL_OpenIO,(const SDL_IOStreamInterface *a, void *b),(a,b),return)
SDL_DYNAPI_PROC(int,SDL_CloseIO,(SDL_IOStream *a),(a),return)
SDL_DYNAPI_PROC(SDL_IOStatus,SDL_GetRWStatus,(SDL_IOStream *a),(a),return)
SDL_DYNAPI_PROC(SDL_IOStatus,SDL_GetIOStatus,(SDL_IOStream *a),(a),return)

10
src/file/SDL_iostream.c
View File

@@ -428,7 +428,7 @@ static SDL_IOStream *SDL_IOFromFP(FILE *fp, SDL_bool autoclose)
if (!iostr) {
iface.close(iodata);
} else {
const SDL_PropertiesID props = SDL_GetRWProperties(iostr);
const SDL_PropertiesID props = SDL_GetIOProperties(iostr);
if (props) {
SDL_SetProperty(props, SDL_PROP_IOSTREAM_STDIO_HANDLE_POINTER, fp);
}
@@ -587,7 +587,7 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
if (!iostr) {
iface.close(iodata);
} else {
const SDL_PropertiesID props = SDL_GetRWProperties(iostr);
const SDL_PropertiesID props = SDL_GetIOProperties(iostr);
if (props) {
SDL_SetProperty(props, SDL_PROP_IOSTREAM_ANDROID_AASSET_POINTER, iodata);
}
@@ -619,7 +619,7 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
if (!iostr) {
windows_file_close(iodata);
} else {
const SDL_PropertiesID props = SDL_GetRWProperties(iostr);
const SDL_PropertiesID props = SDL_GetIOProperties(iostr);
if (props) {
SDL_SetProperty(props, SDL_PROP_IOSTREAM_WINDOWS_HANDLE_POINTER, iodata->h);
}
@@ -724,7 +724,7 @@ SDL_IOStream *SDL_IOFromConstMem(const void *mem, size_t size)
return iostr;
}
SDL_IOStatus SDL_GetRWStatus(SDL_IOStream *context)
SDL_IOStatus SDL_GetIOStatus(SDL_IOStream *context)
{
if (!context) {
SDL_InvalidParamError("context");
@@ -835,7 +835,7 @@ void *SDL_LoadFile(const char *file, size_t *datasize)
return SDL_LoadFile_IO(SDL_IOFromFile(file, "rb"), datasize, SDL_TRUE);
}
SDL_PropertiesID SDL_GetRWProperties(SDL_IOStream *context)
SDL_PropertiesID SDL_GetIOProperties(SDL_IOStream *context)
{
if (!context) {
SDL_InvalidParamError("context");