New module strstack

[cc65] / src / ca65 / listing.c

diff --git a/src/ca65/listing.c b/src/ca65/listing.c
index e132b24c3982f369a3743174b2349d07d9d151e9..f18ac5910994aff6499e37dc65f2c9b57779feda 100644 (file)
--- a/src/ca65/listing.c
+++ b/src/ca65/listing.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2000-2003 Ullrich von Bassewitz                                       */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -40,7 +40,7 @@
 /* common */
 #include "check.h"
 #include "fname.h"
-#include "segdefs.h"
+#include "fragdefs.h"
 #include "version.h"
 #include "xmalloc.h"
 
@@ -48,8 +48,8 @@
 #include "error.h"
 #include "filetab.h"
 #include "global.h"
-#include "objcode.h"
 #include "listing.h"
+#include "segment.h"
 
 
 
@@ -67,7 +67,7 @@ ListLine*       LineLast = 0;         /* Last (current) listing line */
 /* Page and other formatting */
 int                    PageLength = -1;        /* Length of a listing page */
 static unsigned        PageNumber = 1;         /* Current listing page number */
-static unsigned PageLines  = 0;                /* Current line on page */
+static int      PageLines  = 0;                /* Current line on page */
 static unsigned ListBytes  = 12;       /* Number of bytes to list for one line */
 
 /* Switch the listing on/off */
@@ -146,7 +146,7 @@ void DisableListing (void)
     if (Listing) {
        if (ListingEnabled == 0) {
            /* Cannot switch the listing off once more */
-           Error (ERR_COUNTER_UNDERFLOW);
+           Error ("Counter underflow");
        } else {
            --ListingEnabled;
        }
@@ -221,11 +221,12 @@ static void PrintPageHeader (FILE* F, const ListLine* L)
 {
     /* Print the header on the new page */
     fprintf (F,
-            "ca65 V%u.%u.%u - (C) Copyright 1998-2000 Ullrich von Bassewitz\n"
+            "ca65 V%u.%u.%u - %s\n"
             "Main file   : %s\n"
             "Current file: %s\n"
             "\n",
             VER_MAJOR, VER_MINOR, VER_PATCH,
+             Copyright,
             InFile,
             GetFileName (L->File));
 
@@ -305,7 +306,7 @@ void CreateListing (void)
     /* Open the real listing file */
     F = fopen (ListFile, "w");
     if (F == 0) {
-       Fatal (FAT_CANNOT_OPEN_LISTING, strerror (errno));
+       Fatal ("Cannot open listing file: %s", strerror (errno));
     }
 
     /* Reset variables, print the header for the first page */