From c86895264b898be664de74718d34a4cda8bba0a1 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 20 Feb 2018 10:26:33 -0500 Subject: [PATCH] Remove deprecated PHYSFS_getLastError() from all the extras (thanks, Rob!). --- extras/globbing.c | 4 ++-- extras/ignorecase.c | 14 +++++++------- extras/physfsrwops.c | 14 +++++++------- extras/physfsunpack.c | 8 ++++---- extras/selfextract.c | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/extras/globbing.c b/extras/globbing.c index cac9c40d..b639551d 100644 --- a/extras/globbing.c +++ b/extras/globbing.c @@ -208,13 +208,13 @@ int main(int argc, char **argv) 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; } /* if */ if (!PHYSFS_addToSearchPath(".", 1)) { - fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); + fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); PHYSFS_deinit(); return 1; } /* if */ diff --git a/extras/ignorecase.c b/extras/ignorecase.c index 3a58f1bd..e6ea6e3b 100644 --- a/extras/ignorecase.c +++ b/extras/ignorecase.c @@ -101,34 +101,34 @@ int main(int argc, char **argv) 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; } /* if */ if (!PHYSFS_addToSearchPath(".", 1)) { - fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); + fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); PHYSFS_deinit(); return 1; } /* if */ if (!PHYSFS_setWriteDir(".")) { - fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getLastError()); + fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); PHYSFS_deinit(); return 1; } /* if */ 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(); return 1; } /* if */ 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(); return 1; } /* if */ @@ -137,7 +137,7 @@ int main(int argc, char **argv) PHYSFS_close(f); if (f == NULL) { - fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); + fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); PHYSFS_deinit(); return 1; } /* if */ @@ -146,7 +146,7 @@ int main(int argc, char **argv) PHYSFS_close(f); if (f == NULL) { - fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); + fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); PHYSFS_deinit(); return 1; } /* if */ diff --git a/extras/physfsrwops.c b/extras/physfsrwops.c index a8654ab6..ad38f25c 100644 --- a/extras/physfsrwops.c +++ b/extras/physfsrwops.c @@ -70,7 +70,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) if (current == -1) { SDL_SetError("Can't find position in file: %s", - PHYSFS_getLastError()); + PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); return -1; } /* if */ @@ -91,7 +91,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) const PHYSFS_sint64 len = PHYSFS_fileLength(handle); 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; } /* if */ @@ -112,7 +112,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) 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; } /* 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. */ { - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); #if TARGET_SDL2 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_sint64 rc = PHYSFS_writeBytes(handle, ptr, 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 return (size_t) rc; @@ -182,7 +182,7 @@ static int physfsrwops_close(SDL_RWops *rw) PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; if (!PHYSFS_close(handle)) { - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); return -1; } /* if */ @@ -196,7 +196,7 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle) SDL_RWops *retval = NULL; if (handle == NULL) - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); else { retval = SDL_AllocRW(); diff --git a/extras/physfsunpack.c b/extras/physfsunpack.c index 1d26502d..96f87de1 100644 --- a/extras/physfsunpack.c +++ b/extras/physfsunpack.c @@ -28,7 +28,7 @@ static void modTimeToStr(PHYSFS_sint64 modtime, char *modstr, size_t strsize) static void fail(const char *what, const char *why) { if (why == NULL) - why = PHYSFS_getLastError(); + why = PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()); fprintf(stderr, "%s failed: %s\n", what, why); failure = 1; } /* fail */ @@ -150,21 +150,21 @@ int main(int argc, char **argv) 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; } /* if */ if (!PHYSFS_setWriteDir(argv[2])) { fprintf(stderr, "PHYSFS_setWriteDir('%s') failed: %s\n", - argv[2], PHYSFS_getLastError()); + argv[2], PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); return 3; } /* if */ if (!PHYSFS_mount(argv[1], NULL, 1)) { fprintf(stderr, "PHYSFS_mount('%s') failed: %s\n", - argv[1], PHYSFS_getLastError()); + argv[1], PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); return 4; } /* if */ diff --git a/extras/selfextract.c b/extras/selfextract.c index 2e8bba31..2a110e85 100644 --- a/extras/selfextract.c +++ b/extras/selfextract.c @@ -40,14 +40,14 @@ int main(int argc, char **argv) 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; } /* if */ rc = PHYSFS_addToSearchPath(argv[0], 0); 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"); return 42; } /* if */