replace ZZIP_VERSION/ZZIP_PACKAGE_VERSION ZZIP_PACKAGE/ZZIP_PACKAGE_NAME

diff --git a/bins/unzip-mem.c b/bins/unzip-mem.c
index c45cb72b835daa920f725725b642c46a758e74f4..ae24f578a4acfb45e79997200a885d6c93b1eb29 100644 (file)
--- 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 542604917c4422090b10004dfe3b19cd5dfdab28..0c0b5e58bdef98b15260b3024f1b007442c6bbf8 100644 (file)
--- 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 cfa27ab8a5055e390a0201cc9fc3c02107f642b3..6bd79b70b8d2273fcb1023dbf130459635976b24 100644 (file)
--- 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 5a32b1d5b38c8c62cde4b3580ccb3e5386224393..e18987ddd2cfd51b9d233f0b564da279d3a8c12b 100644 (file)
--- 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 be5e7fab69a91cd200034a607ec659e382507cc7..dd78c2be641b1d7f5efe35ebfdca312576c1f2c7 100644 (file)
--- 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 beca7887c9b98e2471a416ea40354f62700874c2..191c4de7208b8b71b39ab35aa47b061af8691ff6 100644 (file)
--- 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 891f77b3450d1d25f6654a46d2190f79449e1ace..a8d2dbaa564e57fdeab91ad55b3ca11641f05b90 100644 (file)
--- 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 b66ae689a106c8abca26df5181dd7b3bc6d8b47d..55801d83367c80b7d7d49a12dc414ae4b58a5c01 100644 (file)
--- 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 ca215a110d0f1b95a9c4f3a52de5eac9f14aeb98..9d8c2edc7fb45ca9f9adf1c3717ed024c4f4c1be 100644 (file)
--- 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 27225820784bd6611d64152b9c57a74124ac5cd6..63026e048c70845f05246751aed2e7c7aab29ec4 100644 (file)
--- 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 39652a97248791a223f46f7c1c0ff358f0c60a5e..acbcac44d2b329808f3082c2f7800c44bfd90e42 100644 (file)
--- 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 965f60d6957f3749d07bb39d6290be7eb0d19b45..4ec0e1296b0d7f0d03f9e06a5ebbd2f494781f27 100644 (file)
--- 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 e9ee3f23b9dd922db4e5f105dd38f3a3d7fd5f29..417e46405e6cf1cdbd4fadb55f86b7c6908df907 100644 (file)
--- 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 352afc29a13f8c1766cdd9fa849dd89fc1dcc69b..dd63b8a661805ddbc43545476ff9d9c7060d4fcf 100644 (file)
--- 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 97fcd51fd327dd78592104d04f82af01f26640c3..3bf2d37dc96a2c542943000488ca2656af89ccc7 100644 (file)
--- 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 269b8fd76a7d5fd9974af3fba42a99b2b6d05a7d..7962efc1168b56c1a3053e57b8b7cf29cf30998a 100644 (file)
--- a/bins/zzxorcopy.c
+++ b/bins/zzxorcopy.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <zzip/_config.h> /* for ZZIP_VERSION */
+#include <zzip/_config.h> /* 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 4c1f4ad6534b1b9cd0adba2588b1ba1fb6095ef1..8a3781462b0c3bb3f7e5e2932b74cc65597a95d2 100644 (file)
--- 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;
     }