Revamp of the Halibut error handling mechanism.

[sgt/halibut] / bk_pdf.c

diff --git a/bk_pdf.c b/bk_pdf.c
index 525e7d9..10b9fdd 100644 (file)
--- a/bk_pdf.c
+++ b/bk_pdf.c
@@ -50,7 +50,6 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
     int font_index;
     font_encoding *fe;
     page_data *page;
-    int pageno;
     FILE *fp;
     char *filename;
     paragraph *p;
@@ -258,6 +257,7 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
                        sprintf(buf, "<%02X>", i + ranges[i] - 1);
                        objstream(cmap, buf);
                        sprintf(buf, "%hu\n",
+                               (unsigned short)
                                sfnt_glyphtoindex(fe->font->info->fontfile,
                                                  fe->vector[i]));
                        objstream(cmap, buf);
@@ -279,6 +279,7 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
                        sprintf(buf, "<%02X>", i);
                        objstream(cmap, buf);
                        sprintf(buf, "%hu\n",
+                               (unsigned short)
                                sfnt_glyphtoindex(fe->font->info->fontfile,
                                                  fe->vector[i]));
                        objstream(cmap, buf);
@@ -427,7 +428,6 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
     /*
      * Create and render the individual pages.
      */
-    pageno = 0;
     for (page = doc->pages; page; page = page->next) {
        object *opage, *cstr;
        rect *r;
@@ -670,7 +670,7 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
     else
        fp = fopen(filename, "wb");
     if (!fp) {
-       error(err_cantopenw, filename);
+       err_cantopenw(filename);
        return;
     }