From: Martin Matuska Date: Wed, 22 Jan 2020 15:06:25 +0000 (+0100) Subject: contrib/archivetest: fix compilation under MinGW X-Git-Tag: v3.4.2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25565e1e259e3ee212b8bf6a15eb5ceb31323548;p=thirdparty%2Flibarchive.git contrib/archivetest: fix compilation under MinGW --- diff --git a/contrib/archivetest.c b/contrib/archivetest.c index 8002039ee..e4a25e3c9 100644 --- a/contrib/archivetest.c +++ b/contrib/archivetest.c @@ -37,10 +37,14 @@ #include #include -const char *errnostr(int errno) +#if defined __MINGW32__ +#include +#endif + +static const char *errnostr(int e) { char *estr; - switch(errno) { + switch(e) { case ARCHIVE_EOF: estr = "ARCHIVE_EOF"; break; @@ -66,12 +70,12 @@ const char *errnostr(int errno) return (estr); } -void usage(const char *prog) +static void usage(const char *prog) { fprintf(stderr, "Usage: %s [-f filename] [-h] [-q] [-s]\n", prog); } -void printhelp() +static void printhelp() { fprintf(stdout, "archivetest: verify reading archives with " "libarchive\n\n" @@ -84,7 +88,7 @@ void printhelp() "\n%s\n", archive_version_details()); } -int v_print(int verbose, const char *format, ...) +static int v_print(int verbose, const char *format, ...) { int r = 0; @@ -139,6 +143,8 @@ int main(int argc, char *argv[]) fprintf(stderr, "Unknown option " "character '\\x%x'.\n", optopt); usage(argv[0]); + exit(1); + break; default: exit(1); }