X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Far65%2Fmain.c;h=5877520de4be5d0d1db9402d8f8b48971acb3a37;hb=bee54df02967b774c485b0a7fa703b5a76345d4e;hp=6cb8fa4bd8dd9a5dd96d1ef54c10b11e18537be4;hpb=697abf3ed78b97ef735b0dffbdee88b74eca03cf;p=cc65

diff --git a/src/ar65/main.c b/src/ar65/main.c
index 6cb8fa4bd..5877520de 100644
--- a/src/ar65/main.c
+++ b/src/ar65/main.c
@@ -6,10 +6,10 @@
 /*									     */
 /*									     */
 /*									     */
-/* (C) 1998-2001 Ullrich von Bassewitz					     */
-/*	    	 Wacholderweg 14					     */
-/*	    	 D-70597 Stuttgart					     */
-/* EMail:   	 uz@musoftware.de					     */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*	    								     */
 /*	    								     */
 /* This software is provided 'as-is', without any expressed or implied	     */
@@ -40,6 +40,7 @@
 
 /* common */
 #include "cmdline.h"
+#include "print.h"
 #include "version.h"
 
 #include "global.h"
@@ -59,15 +60,14 @@
 static void Usage (void)
 /* Print usage information and exit */
 {
-    fprintf (stderr,
-	     "Usage: %s <operation> lib file|module ...\n"
-	     "Operation is one of:\n"
-	     "\ta\tAdd modules\n"
-	     "\td\tDelete modules\n"
-	     "\tl\tList library contents\n"
-	     "\tx\tExtract modules\n"
-	     "\tV\tPrint the archiver version\n",
-	     ProgName);
+    printf ("Usage: %s <operation> lib file|module ...\n"
+            "Operation is one of:\n"
+            "\ta\tAdd modules\n"
+            "\td\tDelete modules\n"
+            "\tl\tList library contents\n"
+            "\tx\tExtract modules\n"
+            "\tV\tPrint the archiver version\n",
+            ProgName);
     exit (EXIT_FAILURE);
 }
 
@@ -76,10 +76,10 @@ static void Usage (void)
 int main (int argc, char* argv [])
 /* Assembler main program */
 {
-    int I;
+    unsigned I;
 
     /* Initialize the cmdline module */
-    InitCmdLine (&argc, &argv, "ar65");	 
+    InitCmdLine (&argc, &argv, "ar65");
 
     /* We must have a file name */
     if (ArgCount < 2) {
@@ -112,7 +112,7 @@ int main (int argc, char* argv [])
 		break;
 
 	    case 'v':
-		++Verbose;
+		++Verbosity;
 		break;
 
 	    case 'x':
@@ -121,8 +121,8 @@ int main (int argc, char* argv [])
 
 	    case 'V':
 		fprintf (stderr,
-			 "ar65 V%u.%u.%u - (C) Copyright 1998-1999 Ullrich von Bassewitz\n",
-			 VER_MAJOR, VER_MINOR, VER_PATCH);
+       	       	       	 "ar65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
+			 GetVersionAsString ());
 		break;
 
 	    default: