geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL_rwops.c: reduce ifdefs, and mark SDL_RWFromFP() as SDL_INLINE.

main
Ozkan Sezer 2022-11-26 20:11:20 +03:00
parent 80c1ddbe97
commit 141bc25198
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/file/SDL_rwops.c
View File

@ -306,8 +306,11 @@ windows_file_close(SDL_RWops * context)
} }
#endif /* defined(__WIN32__) || defined(__GDK__) */ #endif /* defined(__WIN32__) || defined(__GDK__) */
#if defined(HAVE_STDIO_H) && !(defined(__WIN32__) || defined(__GDK__)) #if defined(HAVE_STDIO_H) && !(defined(__WIN32__) || defined(__GDK__))
/* Functions to read/write stdio file pointers. Not used for windows. */
#ifdef HAVE_FOPEN64 #ifdef HAVE_FOPEN64
#define fopen fopen64 #define fopen fopen64
#endif #endif
@ -344,8 +347,6 @@ windows_file_close(SDL_RWops * context)
#define fseek_off_t long #define fseek_off_t long
#endif #endif
/* Functions to read/write stdio file pointers */
static Sint64 SDLCALL static Sint64 SDLCALL
stdio_size(SDL_RWops * context) stdio_size(SDL_RWops * context)
{ {
@ -426,7 +427,6 @@ stdio_close(SDL_RWops * context)
int status = 0; int status = 0;
if (context) { if (context) {
if (context->hidden.stdio.autoclose) { if (context->hidden.stdio.autoclose) {
/* WARNING: Check the return value here! */
if (fclose((FILE *)context->hidden.stdio.fp) != 0) { if (fclose((FILE *)context->hidden.stdio.fp) != 0) {
status = SDL_Error(SDL_EFWRITE); status = SDL_Error(SDL_EFWRITE);
} }
@ -435,7 +435,27 @@ stdio_close(SDL_RWops * context)
} }
return status; return status;
} }
#endif /* !HAVE_STDIO_H */
static SDL_INLINE SDL_RWops *
SDL_RWFromFP(void *fp, SDL_bool autoclose)
{
SDL_RWops *rwops = NULL;
rwops = SDL_AllocRW();
if (rwops != NULL) {
rwops->size = stdio_size;
rwops->seek = stdio_seek;
rwops->read = stdio_read;
rwops->write = stdio_write;
rwops->close = stdio_close;
rwops->hidden.stdio.fp = fp;
rwops->hidden.stdio.autoclose = autoclose;
rwops->type = SDL_RWOPS_STDFILE;
}
return rwops;
}
#endif /* !HAVE_STDIO_H && !(__WIN32__ || __GDK__) */
/* Functions to read/write memory pointers */ /* Functions to read/write memory pointers */
@ -525,28 +545,6 @@ mem_close(SDL_RWops * context)
/* Functions to create SDL_RWops structures from various data sources */ /* Functions to create SDL_RWops structures from various data sources */
#if defined(HAVE_STDIO_H) && !(defined(__WIN32__) || defined(__GDK__))
/* this is used a helper for SDL_RWFromFile(), but not for windows. */
static SDL_RWops *
SDL_RWFromFP(void *fp, SDL_bool autoclose)
{
SDL_RWops *rwops = NULL;
rwops = SDL_AllocRW();
if (rwops != NULL) {
rwops->size = stdio_size;
rwops->seek = stdio_seek;
rwops->read = stdio_read;
rwops->write = stdio_write;
rwops->close = stdio_close;
rwops->hidden.stdio.fp = fp;
rwops->hidden.stdio.autoclose = autoclose;
rwops->type = SDL_RWOPS_STDFILE;
}
return rwops;
}
#endif /* HAVE_STDIO_H */
SDL_RWops * SDL_RWops *
SDL_RWFromFile(const char *file, const char *mode) SDL_RWFromFile(const char *file, const char *mode)
{ {
@ -556,7 +554,7 @@ SDL_RWFromFile(const char *file, const char *mode)
return NULL; return NULL;
} }
#if defined(__ANDROID__) #if defined(__ANDROID__)
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
/* Try to open the file on the filesystem first */ /* Try to open the file on the filesystem first */
if (*file == '/') { if (*file == '/') {
FILE *fp = fopen(file, mode); FILE *fp = fopen(file, mode);
@ -580,7 +578,7 @@ SDL_RWFromFile(const char *file, const char *mode)
} }
} }
} }
#endif /* HAVE_STDIO_H */ #endif /* HAVE_STDIO_H */
/* Try to open the file from the asset system */ /* Try to open the file from the asset system */
rwops = SDL_AllocRW(); rwops = SDL_AllocRW();