Remove some stdio functions

Author: pmer

src/file/SDL_rwops.c

@@ -535,137 +535,6 @@ windows_file_close(SDL_RWops * context)
 }
 #endif /* __WIN32__ */
 
-#ifdef HAVE_STDIO_H
-
-#ifdef HAVE_FOPEN64
-#define fopen   fopen64
-#endif
-#ifdef HAVE_FSEEKO64
-#define fseek_off_t off64_t
-#define fseek   fseeko64
-#define ftell   ftello64
-#elif defined(HAVE_FSEEKO)
-#if defined(OFF_MIN) && defined(OFF_MAX)
-#define FSEEK_OFF_MIN OFF_MIN
-#define FSEEK_OFF_MAX OFF_MAX
-#elif defined(HAVE_LIMITS_H)
-/* POSIX doesn't specify the minimum and maximum macros for off_t so
- * we have to improvise and dance around implementation-defined
- * behavior. This may fail if the off_t type has padding bits or
- * is not a two's-complement representation. The compilers will detect
- * and eliminate the dead code if off_t has 64 bits.
- */
-#define FSEEK_OFF_MAX (((((off_t)1 << (sizeof(off_t) * CHAR_BIT - 2)) - 1) << 1) + 1)
-#define FSEEK_OFF_MIN (-(FSEEK_OFF_MAX) - 1)
-#endif
-#define fseek_off_t off_t
-#define fseek   fseeko
-#define ftell   ftello
-#elif defined(HAVE__FSEEKI64)
-#define fseek_off_t __int64
-#define fseek   _fseeki64
-#define ftell   _ftelli64
-#else
-#ifdef HAVE_LIMITS_H
-#define FSEEK_OFF_MIN LONG_MIN
-#define FSEEK_OFF_MAX LONG_MAX
-#endif
-#define fseek_off_t long
-#endif
-
-/* Functions to read/write stdio file pointers */
-
-static Sint64 SDLCALL
-stdio_size(SDL_RWops * context)
-{
-    Sint64 pos, size;
-
-    pos = SDL_RWseek(context, 0, RW_SEEK_CUR);
-    if (pos < 0) {
-        return -1;
-    }
-    size = SDL_RWseek(context, 0, RW_SEEK_END);
-
-    SDL_RWseek(context, pos, RW_SEEK_SET);
-    return size;
-}
-
-static Sint64 SDLCALL
-stdio_seek(SDL_RWops * context, Sint64 offset, int whence)
-{
-    int stdiowhence;
-
-    switch (whence) {
-    case RW_SEEK_SET:
-        stdiowhence = SEEK_SET;
-        break;
-    case RW_SEEK_CUR:
-        stdiowhence = SEEK_CUR;
-        break;
-    case RW_SEEK_END:
-        stdiowhence = SEEK_END;
-        break;
-    default:
-        return SDL_SetError("Unknown value for 'whence'");
-    }
-
-#if defined(FSEEK_OFF_MIN) && defined(FSEEK_OFF_MAX)
-    if (offset < (Sint64)(FSEEK_OFF_MIN) || offset > (Sint64)(FSEEK_OFF_MAX)) {
-        return SDL_SetError("Seek offset out of range");
-    }
-#endif
-
-    if (fseek(context->hidden.stdio.fp, (fseek_off_t)offset, stdiowhence) == 0) {
-        Sint64 pos = ftell(context->hidden.stdio.fp);
-        if (pos < 0) {
-            return SDL_SetError("Couldn't get stream offset");
-        }
-        return pos;
-    }
-    return SDL_Error(SDL_EFSEEK);
-}
-
-static size_t SDLCALL
-stdio_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
-{
-    size_t nread;
-
-    nread = fread(ptr, size, maxnum, context->hidden.stdio.fp);
-    if (nread == 0 && ferror(context->hidden.stdio.fp)) {
-        SDL_Error(SDL_EFREAD);
-    }
-    return nread;
-}
-
-static size_t SDLCALL
-stdio_write(SDL_RWops * context, const void *ptr, size_t size, size_t num)
-{
-    size_t nwrote;
-
-    nwrote = fwrite(ptr, size, num, context->hidden.stdio.fp);
-    if (nwrote == 0 && ferror(context->hidden.stdio.fp)) {
-        SDL_Error(SDL_EFWRITE);
-    }
-    return nwrote;
-}
-
-static int SDLCALL
-stdio_close(SDL_RWops * context)
-{
-    int status = 0;
-    if (context) {
-        if (context->hidden.stdio.autoclose) {
-            /* WARNING:  Check the return value here! */
-            if (fclose(context->hidden.stdio.fp) != 0) {
-                status = SDL_Error(SDL_EFWRITE);
-            }
-        }
-        SDL_FreeRW(context);
-    }
-    return status;
-}
-#endif /* !HAVE_STDIO_H */
-
 /* Functions to read/write memory pointers */
 
 static Sint64 SDLCALL
@@ -755,133 +624,6 @@ mem_close(SDL_RWops * context)
 
 /* Functions to create SDL_RWops structures from various data sources */
 
-SDL_RWops *
-SDL_RWFromFile(const char *file, const char *mode)
-{
-    SDL_RWops *rwops = NULL;
-    if (!file || !*file || !mode || !*mode) {
-        SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
-        return NULL;
-    }
-#if defined(__ANDROID__)
-#ifdef HAVE_STDIO_H
-    /* Try to open the file on the filesystem first */
-    if (*file == '/') {
-        FILE *fp = fopen(file, mode);
-        if (fp) {
-            return SDL_RWFromFP(fp, 1);
-        }
-    } else {
-        /* Try opening it from internal storage if it's a relative path */
-        char *path;
-        FILE *fp;
-
-        /* !!! FIXME: why not just "char path[PATH_MAX];" ? */
-        path = SDL_stack_alloc(char, PATH_MAX);
-        if (path) {
-            SDL_snprintf(path, PATH_MAX, "%s/%s",
-                         SDL_AndroidGetInternalStoragePath(), file);
-            fp = fopen(path, mode);
-            SDL_stack_free(path);
-            if (fp) {
-                return SDL_RWFromFP(fp, 1);
-            }
-        }
-    }
-#endif /* HAVE_STDIO_H */
-
-    /* Try to open the file from the asset system */
-    rwops = SDL_AllocRW();
-    if (!rwops)
-        return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
-    if (Android_JNI_FileOpen(rwops, file, mode) < 0) {
-        SDL_FreeRW(rwops);
-        return NULL;
-    }
-    rwops->size = Android_JNI_FileSize;
-    rwops->seek = Android_JNI_FileSeek;
-    rwops->read = Android_JNI_FileRead;
-    rwops->write = Android_JNI_FileWrite;
-    rwops->close = Android_JNI_FileClose;
-    rwops->type = SDL_RWOPS_JNIFILE;
-
-#elif defined(__WIN32__)
-    rwops = SDL_AllocRW();
-    if (!rwops)
-        return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
-    if (windows_file_open(rwops, file, mode) < 0) {
-        SDL_FreeRW(rwops);
-        return NULL;
-    }
-    rwops->size = windows_file_size;
-    rwops->seek = windows_file_seek;
-    rwops->read = windows_file_read;
-    rwops->write = windows_file_write;
-    rwops->close = windows_file_close;
-    rwops->type = SDL_RWOPS_WINFILE;
-#elif defined(__VITA__)
-    rwops = SDL_AllocRW();
-    if (!rwops)
-        return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
-    if (vita_file_open(rwops, file, mode) < 0) {
-        SDL_FreeRW(rwops);
-        return NULL;
-    }
-    rwops->size = vita_file_size;
-    rwops->seek = vita_file_seek;
-    rwops->read = vita_file_read;
-    rwops->write = vita_file_write;
-    rwops->close = vita_file_close;
-    rwops->type = SDL_RWOPS_VITAFILE;
-#elif HAVE_STDIO_H
-    {
-        #if __WINRT__
-        FILE *fp = NULL;
-        fopen_s(&fp, file, mode);
-        #else
-        FILE *fp = fopen(file, mode);
-        #endif
-        if (fp == NULL) {
-            SDL_SetError("Couldn't open %s", file);
-        } else {
-            rwops = SDL_RWFromFP(fp, SDL_TRUE);
-        }
-    }
-#else
-    SDL_SetError("SDL not compiled with stdio support");
-#endif /* !HAVE_STDIO_H */
-
-    return rwops;
-}
-
-#ifdef HAVE_STDIO_H
-SDL_RWops *
-SDL_RWFromFP(FILE * 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;
-}
-#else
-SDL_RWops *
-SDL_RWFromFP(void * fp, SDL_bool autoclose)
-{
-    SDL_SetError("SDL not compiled with stdio support");
-    return NULL;
-}
-#endif /* HAVE_STDIO_H */
-
 SDL_RWops *
 SDL_RWFromMem(void *mem, int size)
 {
@@ -1011,12 +753,6 @@ SDL_LoadFile_RW(SDL_RWops * src, size_t *datasize, int freesrc)
     return data;
 }
 
-void *
-SDL_LoadFile(const char *file, size_t *datasize)
-{
-   return SDL_LoadFile_RW(SDL_RWFromFile(file, "rb"), datasize, 1);
-}
-
 Sint64
 SDL_RWsize(SDL_RWops *context)
 {