ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(deps/7zip) Change WRes to int64_t - and other cleanups

This commit is contained in:
twinaphex 2020-06-28 04:15:11 +02:00
parent 136a86f6aa
commit e2af6eb96b
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deps/7zip/7zFile.c vendored
View File

@ -16,16 +16,25 @@ void File_Construct(CSzFile *p)
static WRes File_Open(CSzFile *p, const char *name, int writeMode) static WRes File_Open(CSzFile *p, const char *name, int writeMode)
{ {
p->file = rfopen(name, writeMode ? "wb+" : "rb"); p->file = rfopen(name, writeMode ? "wb+" : "rb");
return (p->file != 0) ? 0 :
#ifdef UNDER_CE #ifdef UNDER_CE
2; /* ENOENT */ if (!p->file)
return 2; /* ENOENT */
#else #else
errno; if (!p->file)
return errno;
#endif #endif
return 0;
} }
WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); } WRes InFile_Open(CSzFile *p, const char *name)
WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); } {
return File_Open(p, name, 0);
}
WRes OutFile_Open(CSzFile *p, const char *name)
{
return File_Open(p, name, 1);
}
WRes File_Close(CSzFile *p) WRes File_Close(CSzFile *p)
{ {
@ -53,7 +62,7 @@ WRes File_Read(CSzFile *p, void *data, size_t *size)
WRes File_Write(CSzFile *p, const void *data, size_t *size) WRes File_Write(CSzFile *p, const void *data, size_t *size)
{ {
size_t originalSize = *size; int64_t originalSize = *size;
if (originalSize == 0) if (originalSize == 0)
return 0; return 0;
@ -65,7 +74,8 @@ WRes File_Write(CSzFile *p, const void *data, size_t *size)
WRes File_Seek(CSzFile *p, int64_t *pos, ESzSeek origin) WRes File_Seek(CSzFile *p, int64_t *pos, ESzSeek origin)
{ {
int whence, res; int whence;
int64_t res;
switch (origin) switch (origin)
{ {
case SZ_SEEK_SET: case SZ_SEEK_SET:

6
deps/7zip/7zTypes.h vendored
View File

@ -43,11 +43,7 @@ EXTERN_C_BEGIN
typedef int SRes; typedef int SRes;
#ifdef _WIN32 typedef int64_t WRes;
typedef unsigned WRes;
#else
typedef int WRes;
#endif
#ifndef RINOK #ifndef RINOK
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; } #define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }