rwops: Add SDL_GetRWStatus, make the statuses into an enum.

This commit is contained in:
Ryan C. Gordon 2024-03-13 12:29:17 -04:00
parent e35c304022
commit cc58da4c63
No known key found for this signature in database
GPG key ID: FA148B892AB48044
5 changed files with 44 additions and 8 deletions

View file

@ -40,13 +40,15 @@ extern "C" {
#endif #endif
/* RWops status, set by a read or write operation */ /* RWops status, set by a read or write operation */
/* !!! FIXME: make this an enum? */ typedef enum SDL_RWopsStatus
#define SDL_RWOPS_STATUS_READY 0 /**< Everything is ready */ {
#define SDL_RWOPS_STATUS_ERROR 1 /**< Read or write I/O error */ SDL_RWOPS_STATUS_READY, /**< Everything is ready */
#define SDL_RWOPS_STATUS_EOF 2 /**< End of file */ SDL_RWOPS_STATUS_ERROR, /**< Read or write I/O error */
#define SDL_RWOPS_STATUS_NOT_READY 3 /**< Non blocking I/O, not ready */ SDL_RWOPS_STATUS_EOF, /**< End of file */
#define SDL_RWOPS_STATUS_READONLY 4 /**< Tried to write a read-only buffer */ SDL_RWOPS_STATUS_NOT_READY, /**< Non blocking I/O, not ready */
#define SDL_RWOPS_STATUS_WRITEONLY 5 /**< Tried to read a write-only buffer */ SDL_RWOPS_STATUS_READONLY, /**< Tried to write a read-only buffer */
SDL_RWOPS_STATUS_WRITEONLY /**< Tried to read a write-only buffer */
} SDL_RWopsStatus;
typedef struct SDL_RWopsInterface typedef struct SDL_RWopsInterface
{ {
@ -318,6 +320,27 @@ extern DECLSPEC SDL_PropertiesID SDLCALL SDL_GetRWProperties(SDL_RWops *context)
#define SDL_RW_SEEK_CUR 1 /**< Seek relative to current read point */ #define SDL_RW_SEEK_CUR 1 /**< Seek relative to current read point */
#define SDL_RW_SEEK_END 2 /**< Seek relative to the end of data */ #define SDL_RW_SEEK_END 2 /**< Seek relative to the end of data */
/**
* Query the stream status of a RWops.
*
* This information can be useful to decide if a short read or write was
* due to an error, an EOF, or a non-blocking operation that isn't yet
* ready to complete.
*
* A RWops's status is only expected to change after a SDL_ReadRW or
* SDL_WriteRW call; don't expect it to change if you just call this
* query function in a tight loop.
*
* \param context the SDL_RWops to query.
* \returns an SDL_RWopsStatus enum with the current state.
*
* \threadsafety This function should not be called at the same time that
* another thread is operating on the same SDL_RWops.
*
* \since This function is available since SDL 3.0.0.
*/
extern DECLSPEC SDL_RWopsStatus SDLCALL SDL_GetRWStatus(SDL_RWops *context);
/** /**
* Use this function to get the size of the data stream in an SDL_RWops. * Use this function to get the size of the data stream in an SDL_RWops.
* *

View file

@ -978,6 +978,7 @@ SDL3_0.0.0 {
SDL_ShowOpenFolderDialog; SDL_ShowOpenFolderDialog;
SDL_OpenRW; SDL_OpenRW;
SDL_CloseRW; SDL_CloseRW;
SDL_GetRWStatus;
# extra symbols go here (don't modify this line) # extra symbols go here (don't modify this line)
local: *; local: *;
}; };

View file

@ -1003,3 +1003,4 @@
#define SDL_ShowOpenFolderDialog SDL_ShowOpenFolderDialog_REAL #define SDL_ShowOpenFolderDialog SDL_ShowOpenFolderDialog_REAL
#define SDL_OpenRW SDL_OpenRW_REAL #define SDL_OpenRW SDL_OpenRW_REAL
#define SDL_CloseRW SDL_CloseRW_REAL #define SDL_CloseRW SDL_CloseRW_REAL
#define SDL_GetRWStatus SDL_GetRWStatus_REAL

View file

@ -1028,3 +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(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_RWops*,SDL_OpenRW,(const SDL_RWopsInterface *a, void *b),(a,b),return) SDL_DYNAPI_PROC(SDL_RWops*,SDL_OpenRW,(const SDL_RWopsInterface *a, void *b),(a,b),return)
SDL_DYNAPI_PROC(int,SDL_CloseRW,(SDL_RWops *a),(a),return) SDL_DYNAPI_PROC(int,SDL_CloseRW,(SDL_RWops *a),(a),return)
SDL_DYNAPI_PROC(SDL_RWopsStatus,SDL_GetRWStatus,(SDL_RWops *a),(a),return)

View file

@ -40,7 +40,7 @@ struct SDL_RWops
{ {
SDL_RWopsInterface iface; SDL_RWopsInterface iface;
void *userdata; void *userdata;
Uint32 status; SDL_RWopsStatus status;
SDL_PropertiesID props; SDL_PropertiesID props;
}; };
@ -724,6 +724,16 @@ SDL_RWops *SDL_RWFromConstMem(const void *mem, size_t size)
return rwops; return rwops;
} }
SDL_RWopsStatus SDL_GetRWStatus(SDL_RWops *context)
{
if (!context) {
SDL_InvalidParamError("context");
return SDL_RWOPS_STATUS_ERROR;
}
return context->status;
}
SDL_RWops *SDL_OpenRW(const SDL_RWopsInterface *iface, void *userdata) SDL_RWops *SDL_OpenRW(const SDL_RWopsInterface *iface, void *userdata)
{ {
if (!iface) { if (!iface) {