=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.45 retrieving revision 1.49 diff -u -p -r1.45 -r1.49 --- mandoc/term_ps.c 2010/09/27 23:03:44 1.45 +++ mandoc/term_ps.c 2011/05/14 17:54:42 1.49 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.45 2010/09/27 23:03:44 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.49 2011/05/14 17:54:42 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * @@ -366,26 +366,21 @@ ps_growbuf(struct termp *p, size_t sz) p->engine.ps.psmargsz += sz; - p->engine.ps.psmarg = realloc + p->engine.ps.psmarg = mandoc_realloc (p->engine.ps.psmarg, p->engine.ps.psmargsz); - - if (NULL == p->engine.ps.psmarg) { - perror(NULL); - exit((int)MANDOCLEVEL_SYSERR); - } } static double ps_hspan(const struct termp *, const struct roffsu *); -static size_t ps_width(const struct termp *, char); +static size_t ps_width(const struct termp *, int); static void ps_advance(struct termp *, size_t); static void ps_begin(struct termp *); static void ps_closepage(struct termp *); static void ps_end(struct termp *); static void ps_endline(struct termp *); static void ps_fclose(struct termp *); -static void ps_letter(struct termp *, char); +static void ps_letter(struct termp *, int); static void ps_pclose(struct termp *); static void ps_pletter(struct termp *, int); static void ps_printf(struct termp *, const char *, ...); @@ -428,8 +423,7 @@ pspdf_alloc(char *outopts) const char *pp; char *v; - if (NULL == (p = term_alloc(TERMENC_ASCII))) - return(NULL); + p = term_alloc(TERMENC_ASCII); p->advance = ps_advance; p->begin = ps_begin; @@ -789,7 +783,6 @@ ps_begin(struct termp *p) if (TERMTYPE_PS == p->type) { ps_printf(p, "%%!PS-Adobe-3.0\n"); - ps_printf(p, "%%%%Creator: mandoc-%s\n", VERSION); ps_printf(p, "%%%%CreationDate: %s", ctime(&t)); ps_printf(p, "%%%%DocumentData: Clean7Bit\n"); ps_printf(p, "%%%%Orientation: Portrait\n"); @@ -809,7 +802,6 @@ ps_begin(struct termp *p) ps_printf(p, "%%PDF-1.1\n"); pdf_obj(p, 1); ps_printf(p, "<<\n"); - ps_printf(p, "/Creator mandoc-%s\n", VERSION); ps_printf(p, ">>\n"); ps_printf(p, "endobj\n"); @@ -971,10 +963,13 @@ ps_fclose(struct termp *p) static void -ps_letter(struct termp *p, char c) +ps_letter(struct termp *p, int arg) { - char cc; + char cc, c; + /* LINTED */ + c = arg >= 128 || arg <= 0 ? '?' : arg; + /* * State machine dictates whether to buffer the last character * or not. Basically, encoded words are detected by checking if @@ -1103,14 +1098,14 @@ ps_setfont(struct termp *p, enum termfont f) /* ARGSUSED */ static size_t -ps_width(const struct termp *p, char c) +ps_width(const struct termp *p, int c) { if (c <= 32 || c - 32 >= MAXCHAR) return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx); c -= 32; - return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx); + return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx); }