X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=error.c;h=6da93e2079a279a2c03f5b3a0e6a945c139cbea6;hp=e17dcc7cd1c832600c24e43f4dfb57b1228ddd38;hb=05d0350b35a6a6b255cb2a3fab7796f5d4ee4d02;hpb=d16b8ea0ee65b2ad901ca6b0624c07e6e4930cc4

diff --git a/error.c b/error.c
index e17dcc7..6da93e2 100644
--- a/error.c
+++ b/error.c
@@ -1,19 +1,20 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // ERROR.C - Error Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "error.h"
-#include "token.h"
+#include <stdarg.h>
 #include "listing.h"
+#include "token.h"
 
-int errcnt;									// Error count
-char * err_fname;							// Name of error message file
+int errcnt;						// Error count
+char * err_fname;				// Name of error message file
 
-static char nl[] = "\n";
+static long unused;				// For supressing 'write' warnings
 
 
 //
@@ -21,34 +22,32 @@ static char nl[] = "\n";
 //
 int at_eol(void)
 {
-   if (*tok != EOL)
-      error("syntax error");
+	if (*tok != EOL)
+		error("syntax error. expected EOL, found $%X ('%c')", *tok, *tok);
 
-   return 0;
+	return 0;
 }
 
 
 //
-// Cannot Create a File
+// Cannot create a file
 //
-void cantcreat(char * fn)
+void cantcreat(const char * fn)
 {
-   printf("cannot create: '%s'\n", fn);
-   exit(1);
+	printf("cannot create: '%s'\n", fn);
+	exit(1);
 }
 
 
 //
-// Setup for Error Message
-// o  Create error listing file (if necessary)
-// o  Set current filename
+// Setup for error message
+//  o  Create error listing file (if necessary)
+//  o  Set current filename
 //
 void err_setup(void)
 {
 	char fnbuf[FNSIZ];
 
-	setfnum(cfileno);
-
 	if (err_fname != NULL)
 	{
 		strcpy(fnbuf, err_fname);
@@ -67,115 +66,58 @@ void err_setup(void)
 
 
 //
-// Display Error Message
+// Display error message (uses printf() style variable arguments)
 //
-int error(const char * s)
-{
-	char buf[EBUFSIZ];
-	unsigned int length;
-
-	err_setup();
-
-	if (listing > 0)
-		ship_ln(s);
-
-	sprintf(buf, "%s%d: Error: %s%s", curfname, curlineno, s, nl);
-	length = strlen(buf);
-
-	if (err_flag)
-		write(err_fd, buf, length);
-	else
-		printf("%s", buf);
-
-	taglist('E');
-	errcnt++;
-
-	return ERROR;
-}
-
-int errors(char * s, char * s1)
+int error(const char * text, ...)
 {
 	char buf[EBUFSIZ];
 	char buf1[EBUFSIZ];
 
 	err_setup();
-	sprintf(buf, s, s1);
+
+	va_list arg;
+	va_start(arg, text);
+	vsprintf(buf, text, arg);
+	va_end(arg);
 
 	if (listing > 0)
 		ship_ln(buf);
 
-	sprintf(buf1, "%s%d: Error: %s%s", curfname, curlineno, buf, nl);
+	sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
 
 	if (err_flag)
-		write(err_fd, buf1, (LONG)strlen(buf1));
+		unused = write(err_fd, buf1, (LONG)strlen(buf1));
 	else
 		printf("%s", buf1);
 
 	taglist('E');
-	++errcnt;
+	errcnt++;
 
 	return ERROR;
 }
 
-int warn(char * s)
-{
-	char buf[EBUFSIZ];
-
-	err_setup();
-
-	if (listing > 0)
-		ship_ln(s);
-
-	sprintf(buf, "%s%d: Warning: %s%s", curfname, curlineno, s, nl);
-
-	if (err_flag)
-		write(err_fd, buf, (LONG)strlen(buf));
-	else
-		printf("%s", buf);
-
-	taglist('W');
-
-	return OK;
-}
-
-int warns(char * s, char * s1)
-{
-	char buf[EBUFSIZ];
-	char buf1[EBUFSIZ];
-
-	err_setup();
-	sprintf(buf, s, s1);
 
-	if (listing > 0)
-		ship_ln(s);
-
-	sprintf(buf1, "%s%d: Warning: %s%s", curfname, curlineno, buf, nl);
-
-	if (err_flag)
-		write(err_fd, buf1, (LONG)strlen(buf1));
-	else
-		printf("%s", buf1);
-
-	taglist('W');
-
-	return OK;
-}
-
-int warni(char * s, unsigned i)
+//
+// Display warning message (uses printf() style variable arguments)
+//
+int warn(const char * text, ...)
 {
 	char buf[EBUFSIZ];
 	char buf1[EBUFSIZ];
 
 	err_setup();
-	sprintf(buf, s, i);
+	va_list arg;
+	va_start(arg, text);
+	vsprintf(buf, text, arg);
+	va_end(arg);
 
 	if (listing > 0)
 		ship_ln(buf);
 
-	sprintf(buf1, "%s%d: Warning: %s%s", curfname, curlineno, buf, nl);
+	sprintf(buf1, "%s %d: Warning: %s\n", curfname, curlineno, buf);
 
 	if (err_flag)
-		write(err_fd, buf1, (LONG)strlen(buf1));
+		unused = write(err_fd, buf1, (LONG)strlen(buf1));
 	else
 		printf("%s", buf1);
 
@@ -184,7 +126,8 @@ int warni(char * s, unsigned i)
 	return OK;
 }
 
-int fatal(char * s)
+
+int fatal(const char * s)
 {
 	char buf[EBUFSIZ];
 
@@ -193,30 +136,32 @@ int fatal(char * s)
 	if (listing > 0)
 		ship_ln(s);
 
-	sprintf(buf, "%s%d: Fatal: %s%s", curfname, curlineno, s, nl);
+	sprintf(buf, "%s %d: Fatal: %s\n", curfname, curlineno, s);
 
 	if (err_flag)
-		write(err_fd, buf, (LONG)strlen(buf));
+		unused = write(err_fd, buf, (LONG)strlen(buf));
 	else
 		printf("%s", buf);
 
 	exit(1);
 }
 
+
 int interror(int n)
 {
 	char buf[EBUFSIZ];
 
 	err_setup();
-	sprintf(buf, "%s%d: Internal Error Number %d%s", curfname, curlineno, n, nl);
+	sprintf(buf, "%s %d: Internal error #%d\n", curfname, curlineno, n);
 
 	if (listing > 0)
 		ship_ln(buf);
 
 	if (err_flag)
-		write(err_fd, buf, (LONG)strlen(buf));
+		unused = write(err_fd, buf, (LONG)strlen(buf));
 	else
 		printf("%s", buf);
 
 	exit(1);
 }
+