Cleanup filestream_seek

This commit is contained in:
twinaphex 2016-04-07 04:16:46 +02:00
parent 2e66300320
commit 55a28eb8a3

View File

@ -240,27 +240,23 @@ error:
ssize_t filestream_seek(RFILE *stream, ssize_t offset, int whence) ssize_t filestream_seek(RFILE *stream, ssize_t offset, int whence)
{ {
int ret = 0;
if (!stream) if (!stream)
goto error; goto error;
(void)ret;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
ret = sceIoLseek(stream->fd, (SceOff)offset, whence); if (sceIoLseek(stream->fd, (SceOff)offset, whence) == -1)
if (ret == -1)
goto error; goto error;
return 0;
#elif defined(__CELLOS_LV2__) #elif defined(__CELLOS_LV2__)
uint64_t pos = 0; uint64_t pos = 0;
if (cellFsLseek(stream->fd, offset, whence, &pos) != CELL_FS_SUCCEEDED) if (cellFsLseek(stream->fd, offset, whence, &pos) != CELL_FS_SUCCEEDED)
goto error; goto error;
return 0;
#else #else
#if defined(HAVE_BUFFERED_IO) #if defined(HAVE_BUFFERED_IO)
if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0) if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
return fseek(stream->fp, (long)offset, whence); return fseek(stream->fp, (long)offset, whence);
#endif #endif
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
/* Need to check stream->mapped because this function is /* Need to check stream->mapped because this function is
* called in filestream_open() */ * called in filestream_open() */
@ -295,12 +291,14 @@ ssize_t filestream_seek(RFILE *stream, ssize_t offset, int whence)
return stream->mappos; return stream->mappos;
} }
#endif #endif
ret = lseek(stream->fd, offset, whence);
if (ret < 0) if (lseek(stream->fd, offset, whence) < 0)
goto error; goto error;
return ret;
#endif #endif
return 0;
error: error:
return -1; return -1;
} }