X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/c419cb975a375cc3cd6d1407cda546dea9154bce..d4319ca364fcc45978174e8c443f20bc05fb5979:/error.c

diff --git a/error.c b/error.c
index 5575100..dfe65e3 100644
--- a/error.c
+++ b/error.c
@@ -19,7 +19,7 @@ static void do_error(int code, va_list ap) {
     int i, j;
     char *sp, *sp2;
     wchar_t *wsp, *wsp2;
-    filepos fpos, fpos2;
+    filepos fpos, fpos2, *fposp;
     int flags;
 
     switch(code) {
@@ -248,11 +248,14 @@ static void do_error(int code, va_list ap) {
 	flags = FILEPOS;
 	break;
       case err_infonodechar:
-	fpos = *va_arg(ap, filepos *);
+	fposp = va_arg(ap, filepos *);
 	c = (char)va_arg(ap, int);
 	sprintf(error, "info output format does not support '%c' in"
 		" node names; removing", c);
-	flags = FILEPOS;
+	if (fposp) {
+	    flags = FILEPOS;
+	    fpos = *fposp;
+	}
 	break;
       case err_text_codeline:
 	fpos = *va_arg(ap, filepos *);
@@ -286,6 +289,32 @@ static void do_error(int code, va_list ap) {
 	flags = FILEPOS;
 	sfree(sp);
 	break;
+      case err_afmeof:
+	fpos = *va_arg(ap, filepos *);
+	sprintf(error, "AFM file ended unexpectedly");
+	flags = FILEPOS;
+	break;
+      case err_afmkey:
+	fpos = *va_arg(ap, filepos *);
+	sp = va_arg(ap, char *);
+	sprintf(error, "required AFM key '%.200s' missing", sp);
+	flags = FILEPOS;
+	break;
+      case err_afmvers:
+	fpos = *va_arg(ap, filepos *);
+	sprintf(error, "unsupported AFM version");
+	flags = FILEPOS;
+	break;
+      case err_afmval:
+	fpos = *va_arg(ap, filepos *);
+	sp = va_arg(ap, char *);
+	i = va_arg(ap, int);
+	if (i == 1)
+	    sprintf(error, "AFM key '%.200s' requires a value", sp);
+	else
+	    sprintf(error, "AFM key '%.200s' requires %d values", sp, i);
+	flags = FILEPOS;
+	break;	
       case err_whatever:
 	sp = va_arg(ap, char *);
         vsprintf(error, sp, ap);