Make ps_glyph_to_unicode() take a glyph index instead of a glyph name.

[sgt/halibut] / error.c

diff --git a/error.c b/error.c
index 2dae220..6b4254d 100644 (file)
--- a/error.c
+++ b/error.c
@@ -20,7 +20,7 @@ static void do_error(int code, va_list ap) {
     char *sp, *sp2;
     wchar_t *wsp, *wsp2;
     filepos fpos, fpos2, *fposp;
-    int flags;
+    int flags = 0;
 
     switch(code) {
       case err_nomemory:              /* no arguments */
@@ -333,9 +333,14 @@ static void do_error(int code, va_list ap) {
       case err_pfnoafm:
        fpos = *va_arg(ap, filepos *);
        sp = va_arg(ap, char *);
-       sprintf(error, "No metrics available for Type 1 font '%.200s'", sp);
+       sprintf(error, "no metrics available for Type 1 font '%.200s'", sp);
        flags = FILEPOS;
        break;
+      case err_chmnames:
+       sprintf(error, "only one of html-mshtmlhelp-chm and "
+               "html-mshtmlhelp-hhp found");
+       flags = PREFIX;
+       break;
       case err_whatever:
        sp = va_arg(ap, char *);
         vsprintf(error, sp, ap);