From 8ea7e55cc203efcc01cc9752e8dd16fb83f0a20a Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Sun, 26 May 2019 12:52:45 +0200 Subject: [PATCH] replace ZZIP_VERSION/ZZIP_PACKAGE_VERSION ZZIP_PACKAGE/ZZIP_PACKAGE_NAME --- bins/unzip-mem.c | 2 +- bins/unzzip.c | 2 +- bins/unzzipcat-mem.c | 2 +- bins/unzzipcat-mix.c | 2 +- bins/unzzipcat-zip.c | 2 +- bins/unzzipdir-mem.c | 2 +- bins/unzzipdir-mix.c | 2 +- bins/unzzipdir-zip.c | 2 +- bins/unzzipshow.c | 2 +- bins/zzcat.c | 2 +- bins/zzdir.c | 2 +- bins/zzip.c | 4 ++-- bins/zziptest.c | 2 +- bins/zzobfuscated.c | 2 +- bins/zzxorcat.c | 2 +- bins/zzxorcopy.c | 4 ++-- bins/zzxordir.c | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bins/unzip-mem.c b/bins/unzip-mem.c index c45cb72..ae24f57 100644 --- a/bins/unzip-mem.c +++ b/bins/unzip-mem.c @@ -317,7 +317,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/unzzip.c b/bins/unzzip.c index 5426049..0c0b5e5 100644 --- a/bins/unzzip.c +++ b/bins/unzzip.c @@ -28,7 +28,7 @@ static const char usage[] = static int unzzip_version(void) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c index cfa27ab..6bd79b7 100644 --- a/bins/unzzipcat-mem.c +++ b/bins/unzzipcat-mem.c @@ -65,7 +65,7 @@ static int unzzip_cat (int argc, char ** argv, int extract) if (argc == 1) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return EXIT_OK; /* better provide an archive argument */ } diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c index 5a32b1d..e18987d 100644 --- a/bins/unzzipcat-mix.c +++ b/bins/unzzipcat-mix.c @@ -51,7 +51,7 @@ static int unzzip_cat (int argc, char ** argv, int extract) if (argc == 1) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return EXIT_OK; /* better provide an archive argument */ } diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c index be5e7fa..dd78c2b 100644 --- a/bins/unzzipcat-zip.c +++ b/bins/unzzipcat-zip.c @@ -52,7 +52,7 @@ static int unzzip_cat (int argc, char ** argv, int extract) if (argc == 1) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return EXIT_OK; /* better provide an archive argument */ } diff --git a/bins/unzzipdir-mem.c b/bins/unzzipdir-mem.c index beca788..191c4de 100644 --- a/bins/unzzipdir-mem.c +++ b/bins/unzzipdir-mem.c @@ -38,7 +38,7 @@ unzzip_list (int argc, char ** argv, int verbose) if (argc == 1) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return EXIT_OK; /* better provide an archive argument */ } diff --git a/bins/unzzipdir-mix.c b/bins/unzzipdir-mix.c index 891f77b..a8d2dba 100644 --- a/bins/unzzipdir-mix.c +++ b/bins/unzzipdir-mix.c @@ -63,7 +63,7 @@ unzzip_list (int argc, char ** argv, int verbose) if (argc == 1) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return EXIT_OK; /* better provide an archive argument */ } diff --git a/bins/unzzipdir-zip.c b/bins/unzzipdir-zip.c index b66ae68..55801d8 100644 --- a/bins/unzzipdir-zip.c +++ b/bins/unzzipdir-zip.c @@ -63,7 +63,7 @@ unzzip_list (int argc, char ** argv, int verbose) if (argc == 1) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return EXIT_OK; /* better provide an archive argument */ } diff --git a/bins/unzzipshow.c b/bins/unzzipshow.c index ca215a1..9d8c2ed 100644 --- a/bins/unzzipshow.c +++ b/bins/unzzipshow.c @@ -55,7 +55,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/zzcat.c b/bins/zzcat.c index 2722582..63026e0 100644 --- a/bins/zzcat.c +++ b/bins/zzcat.c @@ -32,7 +32,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/zzdir.c b/bins/zzdir.c index 39652a9..acbcac4 100644 --- a/bins/zzdir.c +++ b/bins/zzdir.c @@ -29,7 +29,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/zzip.c b/bins/zzip.c index 965f60d..4ec0e12 100644 --- a/bins/zzip.c +++ b/bins/zzip.c @@ -41,9 +41,9 @@ main (int argc, char ** argv) if (! strcmp (argv[1], "--version")) { # if defined _ZZIP_ENABLE_WRITE - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION" - W/ -D_ZZIP_ENABLE_WRITE\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION " - W/ -D_ZZIP_ENABLE_WRITE\n"); # else - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION" - NO -D_ZZIP_ENABLE_WRITE\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION " - NO -D_ZZIP_ENABLE_WRITE\n"); # endif return 0; } diff --git a/bins/zziptest.c b/bins/zziptest.c index e9ee3f2..417e464 100644 --- a/bins/zziptest.c +++ b/bins/zziptest.c @@ -54,7 +54,7 @@ int main(int argc, char ** argv) printf ("zziptest [testfile]\n - selftest defaults to 'test.zip'"); return 0; }else if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; }else if (! strcmp (argv[1], "--quick")) { quick = 1; diff --git a/bins/zzobfuscated.c b/bins/zzobfuscated.c index 352afc2..dd63b8a 100644 --- a/bins/zzobfuscated.c +++ b/bins/zzobfuscated.c @@ -73,7 +73,7 @@ main (int argc, char* argv[]) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/zzxorcat.c b/bins/zzxorcat.c index 97fcd51..3bf2d37 100644 --- a/bins/zzxorcat.c +++ b/bins/zzxorcat.c @@ -60,7 +60,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/zzxorcopy.c b/bins/zzxorcopy.c index 269b8fd..7962efc 100644 --- a/bins/zzxorcopy.c +++ b/bins/zzxorcopy.c @@ -13,7 +13,7 @@ #include #include -#include /* for ZZIP_VERSION */ +#include /* for ZZIP_PACKAGE_VERSION */ #if __STDC_VERSION__+0 < 199901 #define _ssize_t int @@ -54,7 +54,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } diff --git a/bins/zzxordir.c b/bins/zzxordir.c index 4c1f4ad..8a37814 100644 --- a/bins/zzxordir.c +++ b/bins/zzxordir.c @@ -60,7 +60,7 @@ main (int argc, char ** argv) } if (! strcmp (argv[1], "--version")) { - printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n"); + printf (__FILE__ " version " ZZIP_PACKAGE_NAME " " ZZIP_PACKAGE_VERSION "\n"); return 0; } -- 2.40.0