Long forgotten helper script which is used to create tables for VS builds

[rmac] / error.c

diff --git a/error.c b/error.c
index 5c9b8c90133b074d9c16750f7342a370d8ec1ed7..81983b14afecc912d844c54385619cf0758f2153 100644 (file)
--- a/error.c
+++ b/error.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // ERROR.C - Error Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -11,18 +11,21 @@
 #include "listing.h"
 #include "token.h"
 
+// Exported variables
 int errcnt;                                            // Error count
 char * err_fname;                              // Name of error message file
 
+// Internal variables
 static long unused;                            // For supressing 'write' warnings
 
 
 //
 // Report error if not at EOL
+//
 // N.B.: Since this should *never* happen, we can feel free to add whatever
 //       diagnostics that will help in tracking down a problem to this function.
 //
-int at_eol(void)
+int ErrorIfNotAtEOL(void)
 {
        if (*tok != EOL)
        {
@@ -40,9 +43,9 @@ int at_eol(void)
 //
 // Cannot create a file
 //
-void cantcreat(const char * fn)
+void CantCreateFile(const char * fn)
 {
-       printf("cannot create: '%s'\n", fn);
+       printf("Cannot create file: '%s'\n", fn);
        exit(1);
 }
 
@@ -66,7 +69,7 @@ void err_setup(void)
                err_fname = NULL;
 
                if ((err_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
-                       cantcreat(fnbuf);
+                       CantCreateFile(fnbuf);
 
                err_flag = 1;
        }
@@ -91,18 +94,24 @@ int error(const char * text, ...)
        if (listing > 0)
                ship_ln(buf);
 
-       switch (cur_inobj->in_type)
+       if (cur_inobj)
        {
-       case SRC_IFILE:
-               sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
-              break;
-       case SRC_IMACRO:
-               sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.imacro->im_macro->lineList->lineno, buf);
-               break;
-       case SRC_IREPT:
-               sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.irept->lineno, buf);
-               break;
+               switch (cur_inobj->in_type)
+               {
+               case SRC_IFILE:
+                       sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
+                       break;
+               case SRC_IMACRO:
+                       sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.imacro->im_macro->lineList->lineno, buf);
+                       break;
+               case SRC_IREPT:
+                       sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.irept->lineno, buf);
+                       break;
+               }
        }
+       else
+               // No current file so cur_inobj is NULL
+               sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
 
        if (err_flag)
                unused = write(err_fd, buf1, (LONG)strlen(buf1));