Moved verbose output to a shared module in the common/ directory.

git-svn-id: svn://svn.cc65.org/cc65/trunk@619 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/global.c b/src/ar65/global.c
index 8bd122ca39fbd6002f9a1f66e06a3a720c18cc8d..459dc83e7f4999c18f2e2827da818af2ebf354b8 100644 (file)
--- a/src/ar65/global.c
+++ b/src/ar65/global.c
@@ -43,7 +43,3 @@
 
 
 
-int Verbose                        = 0;        /* Verbose operation flag */
-
-
-

diff --git a/src/ar65/global.h b/src/ar65/global.h
index 0a5b841948eb36faa85e172226168184b44c984a..c8021be86a5e6541c59265736b7e8086054bc180 100644 (file)
--- a/src/ar65/global.h
+++ b/src/ar65/global.h
@@ -44,10 +44,6 @@
 
 
 
-extern int             Verbose;        /* Verbose operation flag */
-
-
-
 /* End of global.h */
 
 #endif

diff --git a/src/ar65/library.c b/src/ar65/library.c
index 21b9f072e429dcdba48997453d24ccad1fbf60c5..d92b8b255070ea5ca84bbccc33f0d91ec29cc52a 100644 (file)
--- a/src/ar65/library.c
+++ b/src/ar65/library.c
@@ -42,6 +42,7 @@
 #include "exprdefs.h"
 #include "filepos.h"
 #include "libdefs.h"
+#include "print.h"
 #include "symdefs.h"
 #include "xmalloc.h"
 
@@ -385,11 +386,9 @@ static void LibCheckExports (ObjData* O)
     unsigned Count = GetVar (&Exports);
 
     /* Read the exports */
-    if (Verbose > 1) {
-        printf ("Module `%s' (%u exports):\n", O->Name, Count);
-    }
+    Print (stdout, 1, "Module `%s' (%u exports):\n", O->Name, Count);
     while (Count--) {
-                     
+
        unsigned char   Tag;
        unsigned        Len;
        char*           Name;
@@ -420,9 +419,7 @@ static void LibCheckExports (ObjData* O)
                SkipFilePos (&Exports);
 
        /* Insert the name into the hash table */
-       if (Verbose > 1) {
-               printf ("  %s\n", Name);
-       }
+       Print (stdout, 1, "  %s\n", Name);
        ExpInsert (Name, O->Index);
 
        /* Free the name */

diff --git a/src/ar65/main.c b/src/ar65/main.c
index 6cb8fa4bd8dd9a5dd96d1ef54c10b11e18537be4..f098c8cb3a12dc8dfa2d0f0a2cfd90a2b2e5e140 100644 (file)
--- a/src/ar65/main.c
+++ b/src/ar65/main.c
@@ -40,6 +40,7 @@
 
 /* common */
 #include "cmdline.h"
+#include "print.h"
 #include "version.h"
 
 #include "global.h"
@@ -79,7 +80,7 @@ int main (int argc, char* argv [])
     int I;
 
     /* Initialize the cmdline module */
-    InitCmdLine (&argc, &argv, "ar65");         
+    InitCmdLine (&argc, &argv, "ar65");
 
     /* We must have a file name */
     if (ArgCount < 2) {
@@ -112,7 +113,7 @@ int main (int argc, char* argv [])
                break;
 
            case 'v':
-               ++Verbose;
+               ++Verbosity;
                break;
 
            case 'x':

diff --git a/src/ca65/expr.c b/src/ca65/expr.c
index f6b4125477107df62223b3e8ddce84bcf1aa6e58..c0d8f8e46d7f874288ad45e064811f39d2bdb673 100644 (file)
--- a/src/ca65/expr.c
+++ b/src/ca65/expr.c
@@ -38,6 +38,7 @@
 /* common */
 #include "check.h"
 #include "exprdefs.h"
+#include "print.h"
 #include "tgttrans.h"
 #include "xmalloc.h"
 
@@ -1036,7 +1037,7 @@ int IsConstExpr (ExprNode* Root)
            case EXPR_SYMBOL:
                Sym = Root->V.Sym;
                if (SymHasUserMark (Sym)) {
-                   if (Verbose) {
+                   if (Verbosity > 0) {
                        DumpExpr (Root);
                    }
                    PError (GetSymPos (Sym), ERR_CIRCULAR_REFERENCE);
@@ -1311,7 +1312,7 @@ static ExprNode* RemoveSyms (ExprNode* Expr, int MustClone)
                SymEntry* Sym = Expr->V.Sym;
                if (SymHasUserMark (Sym)) {
                    /* Circular definition */
-                   if (Verbose) {
+                   if (Verbosity) {
                        DumpExpr (Expr);
                    }
                    PError (GetSymPos (Sym), ERR_CIRCULAR_REFERENCE);

diff --git a/src/ca65/global.c b/src/ca65/global.c
index 0bd7a54ee45b94fb68cf4a581bd8f18ab8458c8c..1ea18ca2b7ef7489266b423180dbe64c42f88d14 100644 (file)
--- a/src/ca65/global.c
+++ b/src/ca65/global.c
@@ -56,7 +56,6 @@ char LocalStart                     = '@';    /* This char starts local symbols */
 
 unsigned char IgnoreCase      = 0;     /* Ignore case on identifiers? */
 unsigned char AutoImport      = 0;     /* Mark unresolveds as import */
-unsigned char Verbose         = 0;      /* Verbose operation flag */
 unsigned char SmartMode              = 0;      /* Smart mode */
 unsigned char DbgSyms        = 0;      /* Add debug symbols */
 unsigned char Listing                = 0;      /* Create listing file */

diff --git a/src/ca65/global.h b/src/ca65/global.h
index 7288bb61c909745713c380309906fa82d258bb23..f325e32f154d5ac5ebe09a35fa8cb44a21a93ccd 100644 (file)
--- a/src/ca65/global.h
+++ b/src/ca65/global.h
@@ -57,7 +57,6 @@ extern char           LocalStart;     /* This char starts local symbols */
 
 extern unsigned char   IgnoreCase;     /* Ignore case on identifiers? */
 extern unsigned char   AutoImport;     /* Mark unresolveds as import */
-extern unsigned char   Verbose;        /* Verbose operation flag */
 extern unsigned char   SmartMode;      /* Smart mode */
 extern unsigned char           DbgSyms;        /* Add debug symbols */
 extern unsigned char   Listing;        /* Create listing file */

diff --git a/src/ca65/main.c b/src/ca65/main.c
index b01b50166b23341fcaafd600910e9974db82e13a..61e72d8857a0d025da0efc69b202b5609a43d0b6 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -41,6 +41,7 @@
 /* common */
 #include "chartype.h"
 #include "cmdline.h"
+#include "print.h"
 #include "target.h"
 #include "tgttrans.h"
 #include "version.h"
@@ -313,7 +314,7 @@ static void OptTarget (const char* Opt, const char* Arg)
 static void OptVerbose (const char* Opt, const char* Arg)
 /* Increase verbosity */
 {
-    ++Verbose;
+    ++Verbosity;
 }
 
 
@@ -636,7 +637,7 @@ int main (int argc, char* argv [])
     }
 
     /* Dump the data */
-    if (Verbose >= 2) {
+    if (Verbosity >= 2) {
         SymDump (stdout);
         SegDump ();
     }

diff --git a/src/cc65/error.c b/src/cc65/error.c
index 2f443f28d6a9ae002be25add342f7aa205bc858e..d6557c57ca85df624ef6fe31bb2d34e7c12dbebc 100644 (file)
--- a/src/cc65/error.c
+++ b/src/cc65/error.c
@@ -37,6 +37,10 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+/* common */
+#include "print.h"
+
+/* cc65 */
 #include "global.h"
 #include "input.h"
 #include "scanner.h"
@@ -71,9 +75,7 @@ static void IntWarning (const char* Filename, unsigned Line, const char* Msg, va
        vfprintf (stderr, Msg, ap);
        fprintf (stderr, "\n");
 
-       if (Verbose) {
-           fprintf (stderr, "Line: %s\n", line);
-       }
+       Print (stderr, 1, "Line: %s\n", line);
        ++WarningCount;
     }
 }
@@ -109,9 +111,7 @@ static void IntError (const char* Filename, unsigned Line, const char* Msg, va_l
     vfprintf (stderr, Msg, ap);
     fprintf (stderr, "\n");
 
-    if (Verbose) {
-               fprintf (stderr, "Line: %s\n", line);
-    }
+    Print (stderr, 1, "Line: %s\n", line);
     ++ErrorCount;
     if (ErrorCount > 10) {
                Fatal ("Too many errors");
@@ -154,9 +154,7 @@ void Fatal (const char* Format, ...)
     va_end (ap);
     fprintf (stderr, "\n");
 
-    if (Verbose) {
-               fprintf (stderr, "Line: %s\n", line);
-    }
+    Print (stderr, 1, "Line: %s\n", line);
     exit (EXIT_FAILURE);
 }
 
@@ -184,7 +182,7 @@ void Internal (char* Format, ...)
 void ErrorReport (void)
 /* Report errors (called at end of compile) */
 {
-    if (ErrorCount == 0 && Verbose) {
+    if (ErrorCount == 0 && Verbosity > 0) {
        printf ("No errors.\n");
     }
 }

diff --git a/src/cc65/global.c b/src/cc65/global.c
index fb9d9b0b10cb29d203bef2b84f88461faebf75fa..97beb8ab5be517e0dfabb69dd55eef8bf7f4c36d 100644 (file)
--- a/src/cc65/global.c
+++ b/src/cc65/global.c
@@ -54,7 +54,6 @@ unsigned char AllowRegVarAddr = 0;    /* Allow taking addresses of register vars */
 unsigned char RegVarsToCallStack= 0;           /* Save reg variables on call stack */
 unsigned char StaticLocals     = 0;    /* Make local variables static */
 unsigned char SignedChars      = 0;    /* Make characters signed by default */
-unsigned char Verbose          = 0;    /* Verbose flag */
 unsigned char AddSource                = 0;    /* Add source lines as comments */
 unsigned char DebugInfo                = 0;    /* Add debug info to the obj */
 unsigned char Debug            = 0;    /* Debug mode */

diff --git a/src/cc65/global.h b/src/cc65/global.h
index c48d3815567c682b8a2cc7e55c4888d9750fa98f..593e2f0f25e8825d188b75ee6ba7d67746651872 100644 (file)
--- a/src/cc65/global.h
+++ b/src/cc65/global.h
@@ -55,7 +55,6 @@ extern unsigned char  AllowRegVarAddr;        /* Allow taking addresses of register vars
 extern unsigned char   RegVarsToCallStack;     /* Save reg variables on call stack */
 extern unsigned char           StaticLocals;           /* Make local variables static */
 extern unsigned char   SignedChars;            /* Make characters signed by default */
-extern unsigned char   Verbose;                /* Verbose flag */
 extern unsigned char   AddSource;              /* Add source lines as comments */
 extern unsigned char   DebugInfo;              /* Add debug info to the obj */
 extern unsigned char   Debug;                  /* Debug mode */

diff --git a/src/cc65/main.c b/src/cc65/main.c
index 1b9735e904988acf80c4e2af04ddfd16325dd549..73f8382c9d2cd9740122f94095e660e3186879cc 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -43,6 +43,7 @@
 #include "chartype.h"
 #include "cmdline.h"
 #include "fname.h"
+#include "print.h"
 #include "target.h"
 #include "tgttrans.h"
 #include "version.h"
@@ -410,7 +411,7 @@ static void OptTarget (const char* Opt, const char* Arg)
 static void OptVerbose (const char* Opt, const char* Arg)
 /* Increase verbosity */
 {
-    ++Verbose;
+    ++Verbosity;
 }
 
 

diff --git a/src/cc65/optimize.c b/src/cc65/optimize.c
index c714cf96f372e9b9cbaf925b1d72f1251a6910c5..4a4a07952d413b12b1aa4ef95b16ce5a4641dd32 100644 (file)
--- a/src/cc65/optimize.c
+++ b/src/cc65/optimize.c
@@ -36,12 +36,12 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-//#include <ctype.h>
 
 /* common */
 #include "attrib.h"
 #include "chartype.h"
 #include "check.h"
+#include "print.h"
 #include "xmalloc.h"
 #include "xsprintf.h"
 
@@ -4627,7 +4627,7 @@ void OptDoOpt (void)
     for (I = 0; I < sizeof(OptFuncs)/sizeof(OptFuncs[0]); ++I, Flags <<= 1) {
                if ((OptDisable & Flags) == 0) {
            OptFuncs[I] ();
-       } else if (Verbose || Debug) {
+       } else if (Verbosity > 0 || Debug) {
            printf ("Optimizer pass %u skipped\n", I);
        }
     }

diff --git a/src/cc65/preproc.c b/src/cc65/preproc.c
index 3449a41bec337b6ec8cd18d0e882b3e50d54f2c9..5c652aad4a037af99b09b387da89d9f4484aaeb2 100644 (file)
--- a/src/cc65/preproc.c
+++ b/src/cc65/preproc.c
@@ -8,6 +8,7 @@
 
 /* common */
 #include "chartype.h"
+#include "print.h"
 #include "xmalloc.h"
 
 /* cc65 */
@@ -916,8 +917,6 @@ void Preprocess (void)
 
 Done:
     xlateline ();
-    if (Verbose > 1) {
-       printf ("line: %s\n", line);
-    }
+    Print (stdout, 2, "line: %s\n", line);
 }
 

diff --git a/src/cl65/main.c b/src/cl65/main.c
index bb2a87e593c7224614c9592e6204347bfcba996a..17f816036d797af39630539a61d236640da0ce34 100644 (file)
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -743,7 +743,7 @@ int main (int argc, char* argv [])
 
     /* Our default target is the C64 instead of "none" */
     Target = TGT_C64;
-                               
+
     /* Check the parameters */
     I = 1;
     while (I < ArgCount) {

diff --git a/src/common/print.c b/src/common/print.c
index 52080e7b0a9805ffd670538e4e4d89ab686c4498..48004d226c7aceb06c0c34b83dee099cb7b11d01 100644 (file)
--- a/src/common/print.c
+++ b/src/common/print.c
@@ -33,7 +33,6 @@
 
 
 
-#include <stdio.h>
 #include <stdarg.h>
 
 /* common */
@@ -57,7 +56,7 @@ unsigned char Verbosity = 0;          /* Verbose operation flag */
 
 
 
-void Print (unsigned V, const char* Format, ...)
+void Print (FILE* F, unsigned V, const char* Format, ...)
 /* Output according to Verbosity */
 {
     va_list ap;
@@ -70,7 +69,7 @@ void Print (unsigned V, const char* Format, ...)
 
     /* Output */
     va_start (ap, Format);
-    vprintf (Format, ap);
+    vfprintf (F, Format, ap);
     va_end (ap);
 }
 

diff --git a/src/common/print.h b/src/common/print.h
index 4def4c90d382efa39e8fd8d7b1a3f7f59d7a3e4c..cd5a1d20d49b2033b2fddcbcfcffb593c3198715 100644 (file)
--- a/src/common/print.h
+++ b/src/common/print.h
@@ -38,13 +38,15 @@
 
 
 
+#include <stdio.h>
+
 /* common */
 #include "attrib.h"
 
 
 
 /*****************************************************************************/
-/*                                          Data                                    */
+/*                                          Data                                    */
 /*****************************************************************************/
 
 
@@ -59,7 +61,8 @@ extern unsigned char Verbosity;       /* Verbose operation flag */
 
 
 
-void Print (unsigned V, const char* Format, ...) attribute ((format (printf, 2, 3)));
+void Print (FILE* F, unsigned V, const char* Format, ...)
+       attribute ((format (printf, 3, 4)));
 /* Output according to Verbosity */
 
 

diff --git a/src/da65/global.c b/src/da65/global.c
index c7833a4fce6fd7f203206a1c29cfe48a23bc5988..d3e36dc9d506e3b937b7b97819f636e663f3a222 100644 (file)
--- a/src/da65/global.c
+++ b/src/da65/global.c
@@ -52,7 +52,6 @@ const char OutExt[]         = ".dis"; /* Output file extension */
 const char CfgExt[]                  = ".cfg"; /* Config file extension */
 
 /* Flags and other command line stuff */
-unsigned char Verbosity              = 4;      /* Verbosity of the output file */
 unsigned char FormFeeds              = 0;      /* Add form feeds to the output? */
 unsigned char PassCount              = 2;      /* How many passed do we do? */
 unsigned long StartAddr              = 0xC000; /* Start/load address of the program */

diff --git a/src/da65/global.h b/src/da65/global.h
index 4dcef707720bdc7a74a93214e6d26b0ecaad1b7b..7ebd28dacf3b5df9c16b4e10c49dc059c63f8663 100644 (file)
--- a/src/da65/global.h
+++ b/src/da65/global.h
@@ -53,7 +53,6 @@ extern const char     OutExt[];       /* Output file extension */
 extern const char      CfgExt[];       /* Config file extension */
 
 /* Flags and other command line stuff */
-extern unsigned char           Verbosity;      /* Verbosity of the output file */
 extern unsigned char   FormFeeds;      /* Add form feeds to the output? */
 extern unsigned char   PassCount;      /* How many passed do we do? */
 extern unsigned long   StartAddr;      /* Start/load address of the program */

diff --git a/src/da65/main.c b/src/da65/main.c
index cf33b818869a7c9315a3202e5366902dc3d4c10f..916afbdfb02936fd74250fa5d9b2c2c225462646 100644 (file)
--- a/src/da65/main.c
+++ b/src/da65/main.c
@@ -43,6 +43,7 @@
 #include "abend.h"
 #include "cmdline.h"
 #include "fname.h"
+#include "print.h"
 #include "version.h"
 
 /* da65 */

diff --git a/src/da65/output.c b/src/da65/output.c
index 6f3e3f963a9e96f61a6f34cc9ccfb184865e93ce..985fd4ac2956d4a4d40ce9bed1eb0b6b97e87e7a 100644 (file)
--- a/src/da65/output.c
+++ b/src/da65/output.c
@@ -40,6 +40,7 @@
 #include <errno.h>
 
 /* common */
+#include "print.h"
 #include "version.h"
 
 /* da65 */

diff --git a/src/ld65/bin.c b/src/ld65/bin.c
index f6f7425fa38f98dcb037907dec4333cfc0b249e2..7f4b08551b3eacedfcd3b865b42ad26b79427e0b 100644 (file)
--- a/src/ld65/bin.c
+++ b/src/ld65/bin.c
@@ -38,6 +38,7 @@
 #include <errno.h>
 
 /* common */
+#include "print.h"
 #include "xmalloc.h"
 
 /* ld65 */
@@ -133,9 +134,7 @@ static void BinWriteMem (BinDesc* D, Memory* M)
        SegDesc* S = N->Seg;
 
        /* Keep the user happy */
-       if (Verbose) {
-           printf ("    Writing `%s'\n", S->Name);
-       }
+               Print (stdout, 1, "    Writing `%s'\n", S->Name);
 
        /* Writes do only occur in the load area and not for BSS segments */
                DoWrite = (S->Flags & SF_BSS) == 0      &&      /* No BSS segment */
@@ -143,7 +142,7 @@ static void BinWriteMem (BinDesc* D, Memory* M)
                   S->Seg->Dumped == 0;                 /* Not already written */
 
        /* Output the DoWrite flag for debugging */
-       if (Verbose > 1) {
+       if (Verbosity > 1) {
                    PrintBoolVal ("bss", S->Flags & SF_BSS);
            PrintBoolVal ("LoadArea", S->Load == M);
                    PrintBoolVal ("Dumped", S->Seg->Dumped);
@@ -253,16 +252,12 @@ void BinWriteTarget (BinDesc* D, struct File* F)
     }
 
     /* Keep the user happy */
-    if (Verbose) {
-       printf ("Opened `%s'...\n", F->Name);
-    }
+    Print (stdout, 1, "Opened `%s'...\n", F->Name);
 
     /* Dump all memory areas */
     M = F->MemList;
     while (M) {
-       if (Verbose) {
-           printf ("  Dumping `%s'\n", M->Name);
-       }
+       Print (stdout, 1, "  Dumping `%s'\n", M->Name);
        BinWriteMem (D, M);
        M = M->FNext;
     }

diff --git a/src/ld65/config.c b/src/ld65/config.c
index be31d6fdb5ca04629048843d27c64bf78a5d4da2..902db00a8f05f5b6ac585e7f6a4dfdc6aaba58ff 100644 (file)
--- a/src/ld65/config.c
+++ b/src/ld65/config.c
@@ -41,6 +41,7 @@
 /* common */
 #include "check.h"
 #include "bitops.h"
+#include "print.h"
 #include "xmalloc.h"
 
 /* ld65 */
@@ -1405,9 +1406,7 @@ void CfgWriteTarget (void)
                    MemListNode* N;
 
                    /* Debugging */
-                   if (Verbose > 1) {
-                       printf ("Skipping `%s'...\n", M->Name);
-                   }
+                           Print (stdout, 2, "Skipping `%s'...\n", M->Name);
 
                    /* Walk throught the segments */
                    N = M->SegList;

diff --git a/src/ld65/global.c b/src/ld65/global.c
index fe27c603337ddf0a49ea723f20f6834faf98e1d1..1a624cadebe25a541fe0d0daca3ec8ad9306e1db 100644 (file)
--- a/src/ld65/global.c
+++ b/src/ld65/global.c
@@ -47,7 +47,6 @@ const char* OutputName            = "a.out";  /* Name of output file */
 
 unsigned long StartAddr            = 0x200;    /* Start address */
 
-unsigned char Verbose       = 0;               /* Verbose operation flag */
 unsigned char VerboseMap    = 0;       /* Verbose map file */
 const char* MapFileName            = 0;        /* Name of the map file */
 const char* LabelFileName   = 0;       /* Name of the label file */

diff --git a/src/ld65/global.h b/src/ld65/global.h
index 95309abcc77ff8446d661e1fd237646d59fec9af..288a9d917b721ff8cc98b2d372d7b6982da51751 100644 (file)
--- a/src/ld65/global.h
+++ b/src/ld65/global.h
@@ -48,7 +48,6 @@ extern const char*    OutputName;     /* Name of output file */
 
 extern unsigned long   StartAddr;      /* Start address */
 
-extern unsigned char   Verbose;        /* Verbose operation flag */
 extern unsigned char   VerboseMap;     /* Verbose map file */
 extern const char*     MapFileName;    /* Name of the map file */
 extern const char*     LabelFileName;  /* Name of the label file */

diff --git a/src/ld65/main.c b/src/ld65/main.c
index 6bc07dac002a5b810ab871384ffa8d4815882968..ebc05846dee9fbe5a5420fbdccb7882903f8a0b9 100644 (file)
--- a/src/ld65/main.c
+++ b/src/ld65/main.c
@@ -42,6 +42,7 @@
 #include "cmdline.h"
 #include "libdefs.h"
 #include "objdefs.h"
+#include "print.h"
 #include "target.h"
 #include "version.h"
 #include "xmalloc.h"
@@ -351,7 +352,7 @@ int main (int argc, char* argv [])
                case 'v':
                    switch (Arg [2]) {
                        case 'm':   VerboseMap = 1;     break;
-                       case '\0':  ++Verbose;          break;
+                       case '\0':  ++Verbosity;        break;
                        default:    UnknownOption (Arg);
                    }
                    break;
@@ -426,7 +427,7 @@ int main (int argc, char* argv [])
     }
 
     /* Dump the data for debugging */
-    if (Verbose > 1) {
+    if (Verbosity > 1) {
        SegDump ();
        ConDesDump ();
     }

diff --git a/src/ld65/o65.c b/src/ld65/o65.c
index c1441037b94df66279035673cfdd88b1b03fcad8..841e6df6c74b25de12cf475bc2063d376d1e1fa1 100644 (file)
--- a/src/ld65/o65.c
+++ b/src/ld65/o65.c
@@ -40,6 +40,7 @@
 
 /* common */
 #include "check.h"
+#include "print.h"
 #include "version.h"
 #include "xmalloc.h"
 
@@ -575,9 +576,7 @@ static void O65WriteSeg (O65Desc* D, SegDesc** Seg, unsigned Count, int DoWrite)
                S = Seg [I];
 
        /* Keep the user happy */
-       if (Verbose) {
-           printf ("    Writing `%s'\n", S->Name);
-       }
+       Print (stdout, 1, "    Writing `%s'\n", S->Name);
 
        /* Write this segment */
        if (DoWrite) {
@@ -1018,9 +1017,7 @@ void O65WriteTarget (O65Desc* D, File* F)
     }
 
     /* Keep the user happy */
-    if (Verbose) {
-       printf ("Opened `%s'...\n", F->Name);
-    }
+    Print (stdout, 1, "Opened `%s'...\n", F->Name);
 
     /* Define some more options: A timestamp and the linker version */
     T = time (0);

diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index aa0251c389a2329e8065c2942246fb0366fba04b..3e49facb755f05643b3d0725be8e9badf8347c17 100644 (file)
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -40,6 +40,7 @@
 #include "check.h"
 #include "exprdefs.h"
 #include "hashstr.h"
+#include "print.h"
 #include "segdefs.h"
 #include "symdefs.h"
 #include "xmalloc.h"
@@ -229,10 +230,8 @@ Section* ReadSection (FILE* F, ObjData* O)
     Type = Read8 (F);
 
     /* Print some data */
-    if (Verbose > 1) {
-               printf ("Module `%s': Found segment `%s', size = %lu, align = %u, type = %u\n",
-               GetObjFileName (O), Name, Size, Align, Type);
-    }
+    Print (stdout, 1, "Module `%s': Found segment `%s', size = %lu, align = %u, type = %u\n",
+          GetObjFileName (O), Name, Size, Align, Type);
 
     /* Get the segment for this section */
     S = GetSegment (Name, Type, GetObjFileName (O));