mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename these variables, so missed ifdefs throw more violent errors.

Browse Source
This commit is contained in:
Alcaro 2015-09-17 21:54:33 +02:00
parent 714972bae9
commit 091409cc5a
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libretro-common/file/retro_file.c
View File

@ -45,9 +45,9 @@
struct RFILE struct RFILE
{ {
#if defined(PSP) || defined(VITA) #if defined(PSP) || defined(VITA)
SceUID fd; SceUID sfd;
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
FILE *fd; FILE *file;
#else #else
int fd; int fd;
#endif #endif
@ -64,27 +64,27 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
{ {
case RFILE_MODE_READ: case RFILE_MODE_READ:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
stream->fd = sceIoOpen(path, O_RDONLY, 0777); stream->sfd = sceIoOpen(path, O_RDONLY, 0777);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
stream->fd = fopen(path, "rb"); stream->file = fopen(path, "rb");
#else #else
stream->fd = open(path, O_RDONLY); stream->fd = open(path, O_RDONLY);
#endif #endif
break; break;
case RFILE_MODE_WRITE: case RFILE_MODE_WRITE:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
stream->fd = sceIoOpen(path, O_WRONLY | O_CREAT, 0777); stream->sfd = sceIoOpen(path, O_WRONLY | O_CREAT, 0777);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
stream->fd = fopen(path, "wb"); stream->file = fopen(path, "wb");
#else #else
stream->fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); stream->fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
#endif #endif
break; break;
case RFILE_MODE_READ_WRITE: case RFILE_MODE_READ_WRITE:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
stream->fd = sceIoOpen(path, O_RDWR, 0777); stream->sfd = sceIoOpen(path, O_RDWR, 0777);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
stream->fd = fopen(path, "w+"); stream->file = fopen(path, "w+");
#else #else
#ifdef _WIN32 #ifdef _WIN32
stream->fd = open(path, O_RDWR | O_BINARY); stream->fd = open(path, O_RDWR | O_BINARY);
@ -95,8 +95,10 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
break; break;
} }
#if defined(HAVE_BUFFERED_IO) #if defined(VITA) || defined(PSP)
if (!stream->fd) if (stream->sfd == -1)
#elif defined(HAVE_BUFFERED_IO)
if (!stream->file)
#else #else
if (stream->fd == -1) if (stream->fd == -1)
#endif #endif
@ -115,9 +117,9 @@ ssize_t retro_fseek(RFILE *stream, ssize_t offset, int whence)
return -1; return -1;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return sceIoLseek(stream->fd, (SceOff)offset, whence); return sceIoLseek(stream->sfd, (SceOff)offset, whence);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
return fseek(stream->fd, (long)offset, whence); return fseek(stream->file, (long)offset, whence);
#else #else
return lseek(stream->fd, offset, whence); return lseek(stream->fd, offset, whence);
#endif #endif
@ -128,9 +130,9 @@ ssize_t retro_fread(RFILE *stream, void *s, size_t len)
if (!stream) if (!stream)
return -1; return -1;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return sceIoRead(stream->fd, s, len); return sceIoRead(stream->sfd, s, len);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
return fread(s, len, 1, stream->fd); return fread(s, len, 1, stream->file);
#else #else
return read(stream->fd, s, len); return read(stream->fd, s, len);
#endif #endif
@ -141,9 +143,9 @@ ssize_t retro_fwrite(RFILE *stream, const void *s, size_t len)
if (!stream) if (!stream)
return -1; return -1;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return sceIoWrite(stream->fd, s, len); return sceIoWrite(stream->sfd, s, len);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
return fwrite(s, len, 1, stream->fd); return fwrite(s, len, 1, stream->file);
#else #else
return write(stream->fd, s, len); return write(stream->fd, s, len);
#endif #endif
@ -155,11 +157,11 @@ void retro_fclose(RFILE *stream)
return; return;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
if (stream->fd > 0) if (stream->sfd > 0)
sceIoClose(stream->fd); sceIoClose(stream->sfd);
#elif defined(HAVE_BUFFERED_IO) #elif defined(HAVE_BUFFERED_IO)
if (stream->fd) if (stream->file)
fclose(stream->fd); fclose(stream->file);
#else #else
if (stream->fd > 0) if (stream->fd > 0)
close(stream->fd); close(stream->fd);