mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify OS-specific FileStream code (#10270) 

Define ftello/fseeko to ftello64/fseeko64 only on Linux,
these functions are Linux-specific extensions.

Define ftello/fseeko to _ftelli64/_fseeki64 on MSC.

Otherwise, just use the standardized ftello/fseeko, and avoid
duplicating code for different names of the same function.

This allows this code to be reused on e.g. NetBSD without piling
on additional #ifdefs for any other POSIX operating systems.
This commit is contained in:
nia 2019-12-19 17:34:31 +00:00 committed by Michael Steenbeek
parent 918624e090
commit 1f220f2d62
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/openrct2/core/FileStream.hpp
View File

@ -19,6 +19,16 @@
# include <sys/stat.h>
#endif
#if defined(__linux__) && !defined(__ANDROID__)
# define ftello ftello64
# define fseeko fseeko64
#endif
#ifdef _MSC_VER
# define ftello _ftelli64
# define fseeko _fseeki64
#endif
enum
{
FILE_MODE_OPEN,
@ -127,13 +137,7 @@ public:
}
uint64_t GetPosition() const override
{
#if defined(_MSC_VER)
return _ftelli64(_file);
#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__)
return ftello(_file);
#else
return ftello64(_file);
#endif
}
void SetPosition(uint64_t position) override
@ -143,20 +147,6 @@ public:
void Seek(int64_t offset, int32_t origin) override
{
#if defined(_MSC_VER)
switch (origin)
{
case STREAM_SEEK_BEGIN:
_fseeki64(_file, offset, SEEK_SET);
break;
case STREAM_SEEK_CURRENT:
_fseeki64(_file, offset, SEEK_CUR);
break;
case STREAM_SEEK_END:
_fseeki64(_file, offset, SEEK_END);
break;
}
#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__)
switch (origin)
{
case STREAM_SEEK_BEGIN:
@ -169,20 +159,6 @@ public:
fseeko(_file, offset, SEEK_END);
break;
}
#else
switch (origin)
{
case STREAM_SEEK_BEGIN:
fseeko64(_file, offset, SEEK_SET);
break;
case STREAM_SEEK_CURRENT:
fseeko64(_file, offset, SEEK_CUR);
break;
case STREAM_SEEK_END:
fseeko64(_file, offset, SEEK_END);
break;
}
#endif
}
void Read(void* buffer, uint64_t length) override