X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=error.c;fp=error.c;h=1452e98f8a3ac8339f84a38bbcf43b4ad93942fe;hp=ce22b395f3d87976f60ca0b8beaabe0a359044d7;hb=9102e505f5b98304d3810d40be2446fef5258604;hpb=37694c99b02f939fc259c1e180359afb887acd55

diff --git a/error.c b/error.c
index ce22b39..1452e98 100644
--- a/error.c
+++ b/error.c
@@ -8,6 +8,7 @@
 
 #include "error.h"
 #include <stdarg.h>
+#include <token.h>
 #include "listing.h"
 #include "token.h"
 
@@ -18,7 +19,6 @@ char * err_fname;				// Name of error message file
 // Internal variables
 static long unused;				// For supressing 'write' warnings
 
-
 //
 // Report error if not at EOL
 //
@@ -39,7 +39,6 @@ int ErrorIfNotAtEOL(void)
 	return 0;
 }
 
-
 //
 // Cannot create a file
 //
@@ -49,7 +48,6 @@ void CantCreateFile(const char * fn)
 	exit(1);
 }
 
-
 //
 // Setup for error message
 //  o  Create error listing file (if necessary)
@@ -75,7 +73,6 @@ void err_setup(void)
 	}
 }
 
-
 //
 // Display error message (uses printf() style variable arguments)
 //
@@ -103,13 +100,13 @@ int error(const char * text, ...)
 			break;
 		case SRC_IMACRO:
 		{
-			// This is basically SetFilenameForErrorReporting() but we don't call it here
-			// as it will clobber curfname. That function is used during fixups only so
-			// it really doesn't matter at that point...
+			// This is basically SetFilenameForErrorReporting() but we don't
+			// call it here as it will clobber curfname. That function is used
+			// during fixups only so it really doesn't matter at that point...
 			char * filename;
-#include <token.h>
 			FILEREC * fr;
 			uint16_t fnum = cur_inobj->inobj.imacro->im_macro->cfileno;
+
 			// Check for absolute top filename (this should never happen)
 			if (fnum == -1)
 				interror(8);
@@ -153,7 +150,6 @@ int error(const char * text, ...)
 	return ERROR;
 }
 
-
 //
 // Display warning message (uses printf() style variable arguments)
 //
@@ -183,7 +179,6 @@ int warn(const char * text, ...)
 	return OK;
 }
 
-
 int fatal(const char * s)
 {
 	char buf[EBUFSIZ];
@@ -203,7 +198,6 @@ int fatal(const char * s)
 	exit(1);
 }
 
-
 int interror(int n)
 {
 	char buf[EBUFSIZ];
@@ -221,4 +215,3 @@ int interror(int n)
 
 	exit(1);
 }
-