Audit malloc(3)/calloc(3)/realloc(3) usage.

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index 50984dc0613abb9c69812550fc2f38a4f6a5db2e..f274c1503b463decf3956de393fea994ae937039 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,6 +1,7 @@
-/*     $Id: term_ps.c,v 1.50 2011/05/15 00:58:48 kristaps Exp $ */
+/*     $Id: term_ps.c,v 1.60 2014/04/23 21:06:41 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -30,6 +31,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
 #include <unistd.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "out.h"
 #include "main.h"
 #include "term.h"
 #include "out.h"
 #include "main.h"
 #include "term.h"


@@ -38,11 +40,11 @@
 #define        PS_BUFSLOP        128
 
 /* Convert PostScript point "x" to an AFM unit. */
 #define        PS_BUFSLOP        128
 
 /* Convert PostScript point "x" to an AFM unit. */

-#define        PNT2AFM(p, x) /* LINTED */ \
+#define        PNT2AFM(p, x) \

        (size_t)((double)(x) * (1000.0 / (double)(p)->ps->scale))
 
 /* Convert an AFM unit "x" to a PostScript points */
        (size_t)((double)(x) * (1000.0 / (double)(p)->ps->scale))
 
 /* Convert an AFM unit "x" to a PostScript points */

-#define        AFM2PNT(p, x) /* LINTED */ \
+#define        AFM2PNT(p, x) \

        ((double)(x) / (1000.0 / (double)(p)->ps->scale))
 
 struct glyph {
        ((double)(x) / (1000.0 / (double)(p)->ps->scale))
 
 struct glyph {


@@ -74,10 +76,11 @@ struct      termp_ps {
        size_t            bottom;       /* body bottom (AFM units) */
        size_t            height;       /* page height (AFM units */
        size_t            width;        /* page width (AFM units) */
        size_t            bottom;       /* body bottom (AFM units) */
        size_t            height;       /* page height (AFM units */
        size_t            width;        /* page width (AFM units) */

+       size_t            lastwidth;    /* page width before last ll */

        size_t            left;         /* body left (AFM units) */
        size_t            header;       /* header pos (AFM units) */
        size_t            footer;       /* footer pos (AFM units) */
        size_t            left;         /* body left (AFM units) */
        size_t            header;       /* header pos (AFM units) */
        size_t            footer;       /* footer pos (AFM units) */

-       size_t            pdfbytes;     /* current output byte */
+       size_t            pdfbytes;     /* current output byte */

        size_t            pdflastpg;    /* byte of last page mark */
        size_t            pdfbody;      /* start of body object */
        size_t           *pdfobjs;      /* table of object offsets */
        size_t            pdflastpg;    /* byte of last page mark */
        size_t            pdfbody;      /* start of body object */
        size_t           *pdfobjs;      /* table of object offsets */


@@ -97,9 +100,13 @@ static      void              ps_growbuf(struct termp *, size_t);
 static void              ps_letter(struct termp *, int);
 static void              ps_pclose(struct termp *);
 static void              ps_pletter(struct termp *, int);
 static void              ps_letter(struct termp *, int);
 static void              ps_pclose(struct termp *);
 static void              ps_pletter(struct termp *, int);

+#if __GNUC__ - 0 >= 4
+__attribute__((__format__ (__printf__, 2, 3)))
+#endif

 static void              ps_printf(struct termp *, const char *, ...);
 static void              ps_putchar(struct termp *, char);
 static void              ps_setfont(struct termp *, enum termfont);
 static void              ps_printf(struct termp *, const char *, ...);
 static void              ps_putchar(struct termp *, char);
 static void              ps_setfont(struct termp *, enum termfont);

+static void              ps_setwidth(struct termp *, int, size_t);

 static struct termp     *pspdf_alloc(char *);
 static void              pdf_obj(struct termp *, size_t);
 
 static struct termp     *pspdf_alloc(char *);
 static void              pdf_obj(struct termp *, size_t);
 


@@ -429,12 +436,14 @@ static struct termp *
 pspdf_alloc(char *outopts)
 {
        struct termp    *p;
 pspdf_alloc(char *outopts)
 {
        struct termp    *p;

-       size_t           pagex, pagey, marginx, marginy, lineheight;
+       unsigned int     pagex, pagey;
+       size_t           marginx, marginy, lineheight;

        const char      *toks[2];
        const char      *pp;
        char            *v;
 
        const char      *toks[2];
        const char      *pp;
        char            *v;
 

-       p = term_alloc(TERMENC_ASCII);
+       p = mandoc_calloc(1, sizeof(struct termp));
+       p->enc = TERMENC_ASCII;

        p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
 
        p->advance = ps_advance;
        p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
 
        p->advance = ps_advance;


@@ -443,8 +452,9 @@ pspdf_alloc(char *outopts)
        p->endline = ps_endline;
        p->hspan = ps_hspan;
        p->letter = ps_letter;
        p->endline = ps_endline;
        p->hspan = ps_hspan;
        p->letter = ps_letter;

+       p->setwidth = ps_setwidth;

        p->width = ps_width;
        p->width = ps_width;

-       
+

        toks[0] = "paper";
        toks[1] = NULL;
 
        toks[0] = "paper";
        toks[1] = NULL;
 


@@ -452,7 +462,7 @@ pspdf_alloc(char *outopts)
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {

-               case (0):
+               case 0:

                        pp = v;
                        break;
                default:
                        pp = v;
                        break;
                default:


@@ -484,12 +494,11 @@ pspdf_alloc(char *outopts)
                } else if (0 == strcasecmp(pp, "legal")) {
                        pagex = 216;
                        pagey = 356;
                } else if (0 == strcasecmp(pp, "legal")) {
                        pagex = 216;
                        pagey = 356;

-               } else if (2 != sscanf(pp, "%zux%zu", &pagex, &pagey))
+               } else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))

                        fprintf(stderr, "%s: Unknown paper\n", pp);
                        fprintf(stderr, "%s: Unknown paper\n", pp);

-       } else if (NULL == pp)
-               pp = "letter";
+       }

 
 

-       /* 
+       /*

         * This MUST be defined before any PNT2AFM or AFM2PNT
         * calculations occur.
         */
         * This MUST be defined before any PNT2AFM or AFM2PNT
         * calculations occur.
         */


@@ -503,17 +512,15 @@ pspdf_alloc(char *outopts)
 
        /* Margins are 1/9 the page x and y. */
 
 
        /* Margins are 1/9 the page x and y. */
 

-       marginx = /* LINTED */
-               (size_t)((double)pagex / 9.0);
-       marginy = /* LINTED */
-               (size_t)((double)pagey / 9.0);
+       marginx = (size_t)((double)pagex / 9.0);
+       marginy = (size_t)((double)pagey / 9.0);

 
        /* Line-height is 1.4em. */
 
        lineheight = PNT2AFM(p, ((double)p->ps->scale * 1.4));
 
 
        /* Line-height is 1.4em. */
 
        lineheight = PNT2AFM(p, ((double)p->ps->scale * 1.4));
 

-       p->ps->width = pagex;
-       p->ps->height = pagey;
+       p->ps->width = p->ps->lastwidth = (size_t)pagex;
+       p->ps->height = (size_t)pagey;

        p->ps->header = pagey - (marginy / 2) - (lineheight / 2);
        p->ps->top = pagey - marginy;
        p->ps->footer = (marginy / 2) - (lineheight / 2);
        p->ps->header = pagey - (marginy / 2) - (lineheight / 2);
        p->ps->top = pagey - marginy;
        p->ps->footer = (marginy / 2) - (lineheight / 2);


@@ -525,6 +532,20 @@ pspdf_alloc(char *outopts)
        return(p);
 }
 
        return(p);
 }
 

+static void
+ps_setwidth(struct termp *p, int iop, size_t width)
+{
+       size_t   lastwidth;
+
+       lastwidth = p->ps->width;
+       if (0 < iop)
+               p->ps->width += width;
+       else if (0 > iop)
+               p->ps->width -= width;
+       else
+               p->ps->width = width ? width : p->ps->lastwidth;
+       p->ps->lastwidth = lastwidth;
+}

 
 void
 pspdf_free(void *arg)
 
 void
 pspdf_free(void *arg)


@@ -542,7 +563,6 @@ pspdf_free(void *arg)
        term_free(p);
 }
 
        term_free(p);
 }
 

-

 static void
 ps_printf(struct termp *p, const char *fmt, ...)
 {
 static void
 ps_printf(struct termp *p, const char *fmt, ...)
 {


@@ -560,12 +580,11 @@ ps_printf(struct termp *p, const char *fmt, ...)
        if ( ! (PS_MARGINS & p->ps->flags)) {
                len = vprintf(fmt, ap);
                va_end(ap);
        if ( ! (PS_MARGINS & p->ps->flags)) {
                len = vprintf(fmt, ap);
                va_end(ap);

-               p->ps->pdfbytes += /* LINTED */
-                       len < 0 ? 0 : (size_t)len;
+               p->ps->pdfbytes += len < 0 ? 0 : (size_t)len;

                return;
        }
 
                return;
        }
 

-       /* 
+       /*

         * XXX: I assume that the in-margin print won't exceed
         * PS_BUFSLOP (128 bytes), which is reasonable but still an
         * assumption that will cause pukeage if it's not the case.
         * XXX: I assume that the in-margin print won't exceed
         * PS_BUFSLOP (128 bytes), which is reasonable but still an
         * assumption that will cause pukeage if it's not the case.


@@ -574,14 +593,13 @@ ps_printf(struct termp *p, const char *fmt, ...)
        ps_growbuf(p, PS_BUFSLOP);
 
        pos = (int)p->ps->psmargcur;
        ps_growbuf(p, PS_BUFSLOP);
 
        pos = (int)p->ps->psmargcur;

-       len = vsnprintf(&p->ps->psmarg[pos], PS_BUFSLOP, fmt, ap);
+       vsnprintf(&p->ps->psmarg[pos], PS_BUFSLOP, fmt, ap);

 
        va_end(ap);
 
        p->ps->psmargcur = strlen(p->ps->psmarg);
 }
 
 
        va_end(ap);
 
        p->ps->psmargcur = strlen(p->ps->psmarg);
 }
 

-

 static void
 ps_putchar(struct termp *p, char c)
 {
 static void
 ps_putchar(struct termp *p, char c)
 {


@@ -590,7 +608,6 @@ ps_putchar(struct termp *p, char c)
        /* See ps_printf(). */
 
        if ( ! (PS_MARGINS & p->ps->flags)) {
        /* See ps_printf(). */
 
        if ( ! (PS_MARGINS & p->ps->flags)) {

-               /* LINTED */

                putchar(c);
                p->ps->pdfbytes++;
                return;
                putchar(c);
                p->ps->pdfbytes++;
                return;


@@ -603,7 +620,6 @@ ps_putchar(struct termp *p, char c)
        p->ps->psmarg[pos] = '\0';
 }
 
        p->ps->psmarg[pos] = '\0';
 }
 

-

 static void
 pdf_obj(struct termp *p, size_t obj)
 {
 static void
 pdf_obj(struct termp *p, size_t obj)
 {


@@ -612,20 +628,14 @@ pdf_obj(struct termp *p, size_t obj)
 
        if ((obj - 1) >= p->ps->pdfobjsz) {
                p->ps->pdfobjsz = obj + 128;
 
        if ((obj - 1) >= p->ps->pdfobjsz) {
                p->ps->pdfobjsz = obj + 128;

-               p->ps->pdfobjs = realloc
-                       (p->ps->pdfobjs, 
-                        p->ps->pdfobjsz * sizeof(size_t));
-               if (NULL == p->ps->pdfobjs) {
-                       perror(NULL);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               p->ps->pdfobjs = mandoc_reallocarray(p->ps->pdfobjs,
+                   p->ps->pdfobjsz, sizeof(size_t));

        }
 
        p->ps->pdfobjs[(int)obj - 1] = p->ps->pdfbytes;
        ps_printf(p, "%zu 0 obj\n", obj);
 }
 
        }
 
        p->ps->pdfobjs[(int)obj - 1] = p->ps->pdfbytes;
        ps_printf(p, "%zu 0 obj\n", obj);
 }
 

-

 static void
 ps_closepage(struct termp *p)
 {
 static void
 ps_closepage(struct termp *p)
 {


@@ -658,7 +668,7 @@ ps_closepage(struct termp *p)
                pdf_obj(p, base + 2);
                ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n");
                ps_printf(p, "/Font <<\n");
                pdf_obj(p, base + 2);
                ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n");
                ps_printf(p, "/Font <<\n");

-               for (i = 0; i < (int)TERMFONT__MAX; i++) 
+               for (i = 0; i < (int)TERMFONT__MAX; i++)

                        ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
                ps_printf(p, ">>\n>>\n");
 
                        ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
                ps_printf(p, ">>\n>>\n");
 


@@ -679,8 +689,6 @@ ps_closepage(struct termp *p)
        p->ps->flags |= PS_NEWPAGE;
 }
 
        p->ps->flags |= PS_NEWPAGE;
 }
 

-
-/* ARGSUSED */

 static void
 ps_end(struct termp *p)
 {
 static void
 ps_end(struct termp *p)
 {


@@ -703,7 +711,7 @@ ps_end(struct termp *p)
                ps_printf(p, "%%%%Pages: %zu\n", p->ps->pages);
                ps_printf(p, "%%%%EOF\n");
                return;
                ps_printf(p, "%%%%Pages: %zu\n", p->ps->pages);
                ps_printf(p, "%%%%EOF\n");
                return;

-       } 
+       }

 
        pdf_obj(p, 2);
        ps_printf(p, "<<\n/Type /Pages\n");
 
        pdf_obj(p, 2);
        ps_printf(p, "<<\n/Type /Pages\n");


@@ -715,11 +723,9 @@ ps_end(struct termp *p)
        ps_printf(p, "/Kids [");
 
        for (i = 0; i < p->ps->pages; i++)
        ps_printf(p, "/Kids [");
 
        for (i = 0; i < p->ps->pages; i++)

-               ps_printf(p, " %zu 0 R", i * 4 +
-                               p->ps->pdfbody + 3);
+               ps_printf(p, " %zu 0 R", i * 4 + p->ps->pdfbody + 3);

 
 

-       base = (p->ps->pages - 1) * 4 + 
-               p->ps->pdfbody + 4;
+       base = (p->ps->pages - 1) * 4 + p->ps->pdfbody + 4;

 
        ps_printf(p, "]\n>>\nendobj\n");
        pdf_obj(p, base);
 
        ps_printf(p, "]\n>>\nendobj\n");
        pdf_obj(p, base);


@@ -733,8 +739,8 @@ ps_end(struct termp *p)
        ps_printf(p, "0000000000 65535 f \n");
 
        for (i = 0; i < base; i++)
        ps_printf(p, "0000000000 65535 f \n");
 
        for (i = 0; i < base; i++)

-               ps_printf(p, "%.10zu 00000 n \n", 
-                               p->ps->pdfobjs[(int)i]);
+               ps_printf(p, "%.10zu 00000 n \n",
+                   p->ps->pdfobjs[(int)i]);

 
        ps_printf(p, "trailer\n");
        ps_printf(p, "<<\n");
 
        ps_printf(p, "trailer\n");
        ps_printf(p, "<<\n");


@@ -747,14 +753,13 @@ ps_end(struct termp *p)
        ps_printf(p, "%%%%EOF\n");
 }
 
        ps_printf(p, "%%%%EOF\n");
 }
 

-

 static void
 ps_begin(struct termp *p)
 {
        time_t           t;
        int              i;
 
 static void
 ps_begin(struct termp *p)
 {
        time_t           t;
        int              i;
 

-       /* 
+       /*

         * Print margins into margin buffer.  Nothing gets output to the
         * screen yet, so we don't need to initialise the primary state.
         */
         * Print margins into margin buffer.  Nothing gets output to the
         * screen yet, so we don't need to initialise the primary state.
         */


@@ -787,7 +792,7 @@ ps_begin(struct termp *p)
        assert(p->ps->psmarg);
        assert('\0' != p->ps->psmarg[0]);
 
        assert(p->ps->psmarg);
        assert('\0' != p->ps->psmarg[0]);
 

-       /* 
+       /*

         * Print header and initialise page state.  Following this,
         * stuff gets printed to the screen, so make sure we're sane.
         */
         * Print header and initialise page state.  Following this,
         * stuff gets printed to the screen, so make sure we're sane.
         */


@@ -802,9 +807,9 @@ ps_begin(struct termp *p)
                ps_printf(p, "%%%%Pages: (atend)\n");
                ps_printf(p, "%%%%PageOrder: Ascend\n");
                ps_printf(p, "%%%%DocumentMedia: "
                ps_printf(p, "%%%%Pages: (atend)\n");
                ps_printf(p, "%%%%PageOrder: Ascend\n");
                ps_printf(p, "%%%%DocumentMedia: "

-                               "Default %zu %zu 0 () ()\n",
-                               (size_t)AFM2PNT(p, p->ps->width),
-                               (size_t)AFM2PNT(p, p->ps->height));
+                   "Default %zu %zu 0 () ()\n",
+                   (size_t)AFM2PNT(p, p->ps->width),
+                   (size_t)AFM2PNT(p, p->ps->height));

                ps_printf(p, "%%%%DocumentNeededResources: font");
 
                for (i = 0; i < (int)TERMFONT__MAX; i++)
                ps_printf(p, "%%%%DocumentNeededResources: font");
 
                for (i = 0; i < (int)TERMFONT__MAX; i++)


@@ -823,7 +828,7 @@ ps_begin(struct termp *p)
                        ps_printf(p, "<<\n");
                        ps_printf(p, "/Type /Font\n");
                        ps_printf(p, "/Subtype /Type1\n");
                        ps_printf(p, "<<\n");
                        ps_printf(p, "/Type /Font\n");
                        ps_printf(p, "/Subtype /Type1\n");

-                       ps_printf(p, "/Name /F%zu\n", i);
+                       ps_printf(p, "/Name /F%d\n", i);

                        ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
                        ps_printf(p, ">>\n");
                }
                        ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
                        ps_printf(p, ">>\n");
                }


@@ -836,7 +841,6 @@ ps_begin(struct termp *p)
        ps_setfont(p, TERMFONT_NONE);
 }
 
        ps_setfont(p, TERMFONT_NONE);
 }
 

-

 static void
 ps_pletter(struct termp *p, int c)
 {
 static void
 ps_pletter(struct termp *p, int c)
 {


@@ -849,25 +853,23 @@ ps_pletter(struct termp *p, int c)
 
        if (PS_NEWPAGE & p->ps->flags) {
                if (TERMTYPE_PS == p->type) {
 
        if (PS_NEWPAGE & p->ps->flags) {
                if (TERMTYPE_PS == p->type) {

-                       ps_printf(p, "%%%%Page: %zu %zu\n", 
-                                       p->ps->pages + 1, 
-                                       p->ps->pages + 1);
-                       ps_printf(p, "/%s %zu selectfont\n", 
-                                       fonts[(int)p->ps->lastf].name, 
-                                       p->ps->scale);
+                       ps_printf(p, "%%%%Page: %zu %zu\n",
+                           p->ps->pages + 1, p->ps->pages + 1);
+                       ps_printf(p, "/%s %zu selectfont\n",
+                           fonts[(int)p->ps->lastf].name,
+                           p->ps->scale);

                } else {
                } else {

-                       pdf_obj(p, p->ps->pdfbody + 
-                                       p->ps->pages * 4);
+                       pdf_obj(p, p->ps->pdfbody +
+                           p->ps->pages * 4);

                        ps_printf(p, "<<\n");
                        ps_printf(p, "<<\n");

-                       ps_printf(p, "/Length %zu 0 R\n", 
-                                       p->ps->pdfbody + 1 +
-                                       p->ps->pages * 4);
+                       ps_printf(p, "/Length %zu 0 R\n",
+                           p->ps->pdfbody + 1 + p->ps->pages * 4);

                        ps_printf(p, ">>\nstream\n");
                }
                p->ps->pdflastpg = p->ps->pdfbytes;
                p->ps->flags &= ~PS_NEWPAGE;
        }
                        ps_printf(p, ">>\nstream\n");
                }
                p->ps->pdflastpg = p->ps->pdfbytes;
                p->ps->flags &= ~PS_NEWPAGE;
        }

-       
+

        /*
         * If we're not in a PostScript "word" context, then open one
         * now at the current cursor.
        /*
         * If we're not in a PostScript "word" context, then open one
         * now at the current cursor.


@@ -875,16 +877,15 @@ ps_pletter(struct termp *p, int c)
 
        if ( ! (PS_INLINE & p->ps->flags)) {
                if (TERMTYPE_PS != p->type) {
 
        if ( ! (PS_INLINE & p->ps->flags)) {
                if (TERMTYPE_PS != p->type) {

-                       ps_printf(p, "BT\n/F%d %zu Tf\n", 
-                                       (int)p->ps->lastf,
-                                       p->ps->scale);
+                       ps_printf(p, "BT\n/F%d %zu Tf\n",
+                           (int)p->ps->lastf, p->ps->scale);

                        ps_printf(p, "%.3f %.3f Td\n(",
                        ps_printf(p, "%.3f %.3f Td\n(",

-                                       AFM2PNT(p, p->ps->pscol),
-                                       AFM2PNT(p, p->ps->psrow));
+                           AFM2PNT(p, p->ps->pscol),
+                           AFM2PNT(p, p->ps->psrow));

                } else
                } else

-                       ps_printf(p, "%.3f %.3f moveto\n(", 
-                                       AFM2PNT(p, p->ps->pscol),
-                                       AFM2PNT(p, p->ps->psrow));
+                       ps_printf(p, "%.3f %.3f moveto\n(",
+                           AFM2PNT(p, p->ps->pscol),
+                           AFM2PNT(p, p->ps->psrow));

                p->ps->flags |= PS_INLINE;
        }
 
                p->ps->flags |= PS_INLINE;
        }
 


@@ -898,11 +899,11 @@ ps_pletter(struct termp *p, int c)
         */
 
        switch (c) {
         */
 
        switch (c) {

-       case ('('):
+       case '(':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (')'):
+       case ')':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('\\'):
+       case '\\':

                ps_putchar(p, '\\');
                break;
        default:
                ps_putchar(p, '\\');
                break;
        default:


@@ -917,19 +918,18 @@ ps_pletter(struct termp *p, int c)
                ps_putchar(p, ' ');
                p->ps->pscol += (size_t)fonts[f].gly[0].wx;
                return;
                ps_putchar(p, ' ');
                p->ps->pscol += (size_t)fonts[f].gly[0].wx;
                return;

-       } 
+       }

 
        ps_putchar(p, (char)c);
        c -= 32;
        p->ps->pscol += (size_t)fonts[f].gly[c].wx;
 }
 
 
        ps_putchar(p, (char)c);
        c -= 32;
        p->ps->pscol += (size_t)fonts[f].gly[c].wx;
 }
 

-

 static void
 ps_pclose(struct termp *p)
 {
 
 static void
 ps_pclose(struct termp *p)
 {
 

-       /* 
+       /*

         * Spit out that we're exiting a word context (this is a
         * "partial close" because we don't check the last-char buffer
         * or anything).
         * Spit out that we're exiting a word context (this is a
         * "partial close" because we don't check the last-char buffer
         * or anything).


@@ -937,7 +937,7 @@ ps_pclose(struct termp *p)
 
        if ( ! (PS_INLINE & p->ps->flags))
                return;
 
        if ( ! (PS_INLINE & p->ps->flags))
                return;

-       
+

        if (TERMTYPE_PS != p->type) {
                ps_printf(p, ") Tj\nET\n");
        } else
        if (TERMTYPE_PS != p->type) {
                ps_printf(p, ") Tj\nET\n");
        } else


@@ -946,7 +946,6 @@ ps_pclose(struct termp *p)
        p->ps->flags &= ~PS_INLINE;
 }
 
        p->ps->flags &= ~PS_INLINE;
 }
 

-

 static void
 ps_fclose(struct termp *p)
 {
 static void
 ps_fclose(struct termp *p)
 {


@@ -974,13 +973,11 @@ ps_fclose(struct termp *p)
        ps_pclose(p);
 }
 
        ps_pclose(p);
 }
 

-

 static void
 ps_letter(struct termp *p, int arg)
 {
        char            cc, c;
 
 static void
 ps_letter(struct termp *p, int arg)
 {
        char            cc, c;
 

-       /* LINTED */

        c = arg >= 128 || arg <= 0 ? '?' : arg;
 
        /*
        c = arg >= 128 || arg <= 0 ? '?' : arg;
 
        /*


@@ -1025,7 +1022,6 @@ ps_letter(struct termp *p, int arg)
        ps_pletter(p, c);
 }
 
        ps_pletter(p, c);
 }
 

-

 static void
 ps_advance(struct termp *p, size_t len)
 {
 static void
 ps_advance(struct termp *p, size_t len)
 {


@@ -1041,7 +1037,6 @@ ps_advance(struct termp *p, size_t len)
        p->ps->pscol += len;
 }
 
        p->ps->pscol += len;
 }
 

-

 static void
 ps_endline(struct termp *p)
 {
 static void
 ps_endline(struct termp *p)
 {


@@ -1053,7 +1048,7 @@ ps_endline(struct termp *p)
        /*
         * If we're in the margin, don't try to recalculate our current
         * row.  XXX: if the column tries to be fancy with multiple
        /*
         * If we're in the margin, don't try to recalculate our current
         * row.  XXX: if the column tries to be fancy with multiple

-        * lines, we'll do nasty stuff. 
+        * lines, we'll do nasty stuff.

         */
 
        if (PS_MARGINS & p->ps->flags)
         */
 
        if (PS_MARGINS & p->ps->flags)


@@ -1073,8 +1068,7 @@ ps_endline(struct termp *p)
         * showpage and restart our row.
         */
 
         * showpage and restart our row.
         */
 

-       if (p->ps->psrow >= p->ps->lineheight + 
-                       p->ps->bottom) {
+       if (p->ps->psrow >= p->ps->lineheight + p->ps->bottom) {

                p->ps->psrow -= p->ps->lineheight;
                return;
        }
                p->ps->psrow -= p->ps->lineheight;
                return;
        }


@@ -1082,14 +1076,13 @@ ps_endline(struct termp *p)
        ps_closepage(p);
 }
 
        ps_closepage(p);
 }
 

-

 static void
 ps_setfont(struct termp *p, enum termfont f)
 {
 
        assert(f < TERMFONT__MAX);
        p->ps->lastf = f;
 static void
 ps_setfont(struct termp *p, enum termfont f)
 {
 
        assert(f < TERMFONT__MAX);
        p->ps->lastf = f;

-       
+

        /*
         * If we're still at the top of the page, let the font-setting
         * be delayed until we actually have stuff to print.
        /*
         * If we're still at the top of the page, let the font-setting
         * be delayed until we actually have stuff to print.


@@ -1099,17 +1092,13 @@ ps_setfont(struct termp *p, enum termfont f)
                return;
 
        if (TERMTYPE_PS == p->type)
                return;
 
        if (TERMTYPE_PS == p->type)

-               ps_printf(p, "/%s %zu selectfont\n", 
-                               fonts[(int)f].name, 
-                               p->ps->scale);
+               ps_printf(p, "/%s %zu selectfont\n",
+                   fonts[(int)f].name, p->ps->scale);

        else
        else

-               ps_printf(p, "/F%d %zu Tf\n", 
-                               (int)f, 
-                               p->ps->scale);
+               ps_printf(p, "/F%d %zu Tf\n",
+                   (int)f, p->ps->scale);

 }
 
 }
 

-
-/* ARGSUSED */

 static size_t
 ps_width(const struct termp *p, int c)
 {
 static size_t
 ps_width(const struct termp *p, int c)
 {


@@ -1121,42 +1110,41 @@ ps_width(const struct termp *p, int c)
        return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }
 
        return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }
 

-

 static double
 ps_hspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
 static double
 ps_hspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;

-       
+

        /*
         * All of these measurements are derived by converting from the
         * native measurement to AFM units.
         */
 
        switch (su->unit) {
        /*
         * All of these measurements are derived by converting from the
         * native measurement to AFM units.
         */
 
        switch (su->unit) {

-       case (SCALE_CM):
+       case SCALE_CM:

                r = PNT2AFM(p, su->scale * 28.34);
                break;
                r = PNT2AFM(p, su->scale * 28.34);
                break;

-       case (SCALE_IN):
+       case SCALE_IN:

                r = PNT2AFM(p, su->scale * 72);
                break;
                r = PNT2AFM(p, su->scale * 72);
                break;

-       case (SCALE_PC):
+       case SCALE_PC:

                r = PNT2AFM(p, su->scale * 12);
                break;
                r = PNT2AFM(p, su->scale * 12);
                break;

-       case (SCALE_PT):
+       case SCALE_PT:

                r = PNT2AFM(p, su->scale * 100);
                break;
                r = PNT2AFM(p, su->scale * 100);
                break;

-       case (SCALE_EM):
+       case SCALE_EM:

                r = su->scale *
                r = su->scale *

-                       fonts[(int)TERMFONT_NONE].gly[109 - 32].wx;
+                   fonts[(int)TERMFONT_NONE].gly[109 - 32].wx;

                break;
                break;

-       case (SCALE_MM):
+       case SCALE_MM:

                r = PNT2AFM(p, su->scale * 2.834);
                break;
                r = PNT2AFM(p, su->scale * 2.834);
                break;

-       case (SCALE_EN):
+       case SCALE_EN:

                r = su->scale *
                r = su->scale *

-                       fonts[(int)TERMFONT_NONE].gly[110 - 32].wx;
+                   fonts[(int)TERMFONT_NONE].gly[110 - 32].wx;

                break;
                break;

-       case (SCALE_VS):
+       case SCALE_VS:

                r = su->scale * p->ps->lineheight;
                break;
        default:
                r = su->scale * p->ps->lineheight;
                break;
        default:


@@ -1177,8 +1165,5 @@ ps_growbuf(struct termp *p, size_t sz)
                sz = PS_BUFSLOP;
 
        p->ps->psmargsz += sz;
                sz = PS_BUFSLOP;
 
        p->ps->psmargsz += sz;

-
-       p->ps->psmarg = mandoc_realloc
-               (p->ps->psmarg, p->ps->psmargsz);
+       p->ps->psmarg = mandoc_realloc(p->ps->psmarg, p->ps->psmargsz);

 }
 }

-