walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove deprecated PHYSFS_getLastError() from all the extras (thanks, Rob!).

This commit is contained in:
Ryan C. Gordon 2018-02-20 10:26:33 -05:00
parent 47b0e834dc
commit c86895264b
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extras/globbing.c
View File

@ -208,13 +208,13 @@ int main(int argc, char **argv)
if (!PHYSFS_init(argv[0])) if (!PHYSFS_init(argv[0]))
{ {
fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return 1; return 1;
} /* if */ } /* if */
if (!PHYSFS_addToSearchPath(".", 1)) if (!PHYSFS_addToSearchPath(".", 1))
{ {
fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */

14
extras/ignorecase.c
View File

@ -101,34 +101,34 @@ int main(int argc, char **argv)
if (!PHYSFS_init(argv[0])) if (!PHYSFS_init(argv[0]))
{ {
fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return 1; return 1;
} /* if */ } /* if */
if (!PHYSFS_addToSearchPath(".", 1)) if (!PHYSFS_addToSearchPath(".", 1))
{ {
fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */
if (!PHYSFS_setWriteDir(".")) if (!PHYSFS_setWriteDir("."))
{ {
fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */
if (!PHYSFS_mkdir("/a/b/c")) if (!PHYSFS_mkdir("/a/b/c"))
{ {
fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */
if (!PHYSFS_mkdir("/a/b/C")) if (!PHYSFS_mkdir("/a/b/C"))
{ {
fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */
@ -137,7 +137,7 @@ int main(int argc, char **argv)
PHYSFS_close(f); PHYSFS_close(f);
if (f == NULL) if (f == NULL)
{ {
fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */
@ -146,7 +146,7 @@ int main(int argc, char **argv)
PHYSFS_close(f); PHYSFS_close(f);
if (f == NULL) if (f == NULL)
{ {
fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
PHYSFS_deinit(); PHYSFS_deinit();
return 1; return 1;
} /* if */ } /* if */

14
extras/physfsrwops.c
View File

@ -70,7 +70,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
if (current == -1) if (current == -1)
{ {
SDL_SetError("Can't find position in file: %s", SDL_SetError("Can't find position in file: %s",
PHYSFS_getLastError()); PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return -1; return -1;
} /* if */ } /* if */
@ -91,7 +91,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
const PHYSFS_sint64 len = PHYSFS_fileLength(handle); const PHYSFS_sint64 len = PHYSFS_fileLength(handle);
if (len == -1) if (len == -1)
{ {
SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError()); SDL_SetError("Can't find end of file: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return -1; return -1;
} /* if */ } /* if */
@ -112,7 +112,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos)) if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos))
{ {
SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return -1; return -1;
} /* if */ } /* if */
@ -138,7 +138,7 @@ static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
{ {
if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */ if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */
{ {
SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
#if TARGET_SDL2 #if TARGET_SDL2
return 0; return 0;
@ -167,7 +167,7 @@ static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num)
const PHYSFS_uint64 writelen = (PHYSFS_uint64) (num * size); const PHYSFS_uint64 writelen = (PHYSFS_uint64) (num * size);
const PHYSFS_sint64 rc = PHYSFS_writeBytes(handle, ptr, writelen); const PHYSFS_sint64 rc = PHYSFS_writeBytes(handle, ptr, writelen);
if (rc != ((PHYSFS_sint64) writelen)) if (rc != ((PHYSFS_sint64) writelen))
SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
#if TARGET_SDL2 #if TARGET_SDL2
return (size_t) rc; return (size_t) rc;
@ -182,7 +182,7 @@ static int physfsrwops_close(SDL_RWops *rw)
PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1;
if (!PHYSFS_close(handle)) if (!PHYSFS_close(handle))
{ {
SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return -1; return -1;
} /* if */ } /* if */
@ -196,7 +196,7 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle)
SDL_RWops *retval = NULL; SDL_RWops *retval = NULL;
if (handle == NULL) if (handle == NULL)
SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
else else
{ {
retval = SDL_AllocRW(); retval = SDL_AllocRW();

8
extras/physfsunpack.c
View File

@ -28,7 +28,7 @@ static void modTimeToStr(PHYSFS_sint64 modtime, char *modstr, size_t strsize)
static void fail(const char *what, const char *why) static void fail(const char *what, const char *why)
{ {
if (why == NULL) if (why == NULL)
why = PHYSFS_getLastError(); why = PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode());
fprintf(stderr, "%s failed: %s\n", what, why); fprintf(stderr, "%s failed: %s\n", what, why);
failure = 1; failure = 1;
} /* fail */ } /* fail */
@ -150,21 +150,21 @@ int main(int argc, char **argv)
if (!PHYSFS_init(argv[0])) if (!PHYSFS_init(argv[0]))
{ {
fprintf(stderr, "PHYSFS_init() failed: %s\n", PHYSFS_getLastError()); fprintf(stderr, "PHYSFS_init() failed: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return 2; return 2;
} /* if */ } /* if */
if (!PHYSFS_setWriteDir(argv[2])) if (!PHYSFS_setWriteDir(argv[2]))
{ {
fprintf(stderr, "PHYSFS_setWriteDir('%s') failed: %s\n", fprintf(stderr, "PHYSFS_setWriteDir('%s') failed: %s\n",
argv[2], PHYSFS_getLastError()); argv[2], PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return 3; return 3;
} /* if */ } /* if */
if (!PHYSFS_mount(argv[1], NULL, 1)) if (!PHYSFS_mount(argv[1], NULL, 1))
{ {
fprintf(stderr, "PHYSFS_mount('%s') failed: %s\n", fprintf(stderr, "PHYSFS_mount('%s') failed: %s\n",
argv[1], PHYSFS_getLastError()); argv[1], PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return 4; return 4;
} /* if */ } /* if */

4
extras/selfextract.c
View File

@ -40,14 +40,14 @@ int main(int argc, char **argv)
if (!PHYSFS_init(argv[0])) if (!PHYSFS_init(argv[0]))
{ {
printf("PHYSFS_init() failed: %s\n", PHYSFS_getLastError()); printf("PHYSFS_init() failed: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
return 42; return 42;
} /* if */ } /* if */
rc = PHYSFS_addToSearchPath(argv[0], 0); rc = PHYSFS_addToSearchPath(argv[0], 0);
if (!rc) if (!rc)
{ {
printf("Couldn't find self-extract data: %s\n", PHYSFS_getLastError()); printf("Couldn't find self-extract data: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
printf("This might mean you didn't append a zipfile to the binary.\n"); printf("This might mean you didn't append a zipfile to the binary.\n");
return 42; return 42;
} /* if */ } /* if */