Change fatal() and error() to use varargs.

util/ncgg/emlookup.c

@@ -10,6 +10,7 @@ static char rcsid[]= "$Id$";
 #include <string.h>
 #include "param.h"
 #include "expr.h"
+#include "extern.h"
 #include <em_spec.h>
 #include <em_flag.h>
 

util/ncgg/error.c

@@ -8,6 +8,8 @@ static char rcsid[]= "$Id$";
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdarg.h>
+#include "extern.h"
 
 int nerrors=0;
 
@@ -24,24 +26,38 @@ goodbye() {
 #endif
 }
 
-/*VARARGS1*/
+void errorv(const char* s, va_list ap)
-fatal(s,a,b,c,d) char *s; {
+{
+	extern int lineno;
+	extern char *filename;
+
+	fprintf(stderr, "\"%s\", line %d:", filename, lineno);
+	vfprintf(stderr, s, ap);
+	fprintf(stderr, "\n");
+	nerrors++;
+}
+
+void fatal(const char* s, ...)
+{
+
+	va_list ap;
+
+	va_start(ap, s);
+	errorv(s, ap);
+	va_end(ap);
 
-	error(s,a,b,c,d);
 	errorexit();
 	goodbye();
 	exit(-1);
 }
 
-/*VARARGS1*/
+void error(const char* s, ...)
-error(s,a,b,c,d) char *s; {
+{
-	extern int lineno;
+	va_list ap;
-	extern char *filename;
 
-	fprintf(stderr,"\"%s\", line %d:",filename,lineno);
+	va_start(ap, s);
-	fprintf(stderr,s,a,b,c,d);
+	errorv(s, ap);
-	fprintf(stderr,"\n");
+	va_end(ap);
-	nerrors++;
 }
 
 #ifndef NDEBUG

util/ncgg/extern.h

@@ -40,3 +40,7 @@ extern int use_tes;
 
 extern char *mystrcpy();
 extern char *myalloc();
+
+extern void error(const char* s, ...);
+extern void fatal(const char* s, ...);
+

util/ncgg/hall.c

@@ -9,6 +9,7 @@ static char rcsid[]= "$Id$";
 #include "assert.h"
 #include "param.h"
 #include "set.h"
+#include "extern.h"
 #include <stdio.h>
 
 /*

util/ncgg/lookup.c

@@ -9,6 +9,7 @@ static char rcsid[]= "$Id$";
 #include "assert.h"
 #include "param.h"
 #include "lookup.h"
+#include "extern.h"
 
 char *myalloc();
 char *mystrcpy();

util/ncgg/main.c

@@ -8,6 +8,7 @@ static char rcsid[]= "$Id$";
 
 #include <stdlib.h>
 #include <stdio.h>
+#include "extern.h"
 
 char *filename;
 char *beg_sbrk;

util/ncgg/strlookup.c

@@ -7,6 +7,7 @@ static char rcsid[]= "$Id$";
 #endif
 
 #include "param.h"
+#include "extern.h"
 
 int nstrings=0;
 char *l_strings[MAXSTRINGS];

util/ncgg/var.c

@@ -13,6 +13,7 @@ static char rcsid[]= "$Id$";
 #include "set.h"
 #include "instruct.h"
 #include "lookup.h"
+#include "extern.h"
 #include <cgg_cg.h>
 
 int wordsize;