diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2017-11-10 23:42:52 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-11-10 23:42:52 +0000 |
commit | 99570f28d8f6b74f1cdc7dac42ff51b791aba129 (patch) | |
tree | 2967a908488d36397832aabcecc71315d07b3d87 /term_ps.c | |
parent | 8d83cf1f1cf12f5a501eff2b0fb67eea1938dfc0 (diff) | |
download | mandoc-99570f28d8f6b74f1cdc7dac42ff51b791aba129.tar.gz mandoc-99570f28d8f6b74f1cdc7dac42ff51b791aba129.tar.zst mandoc-99570f28d8f6b74f1cdc7dac42ff51b791aba129.zip |
streamline termp allocation: this will allow the init function
to do things differently in the ps vs pdf case;
from espie@
Diffstat (limited to 'term_ps.c')
-rw-r--r-- | term_ps.c | 21 |
1 files changed, 6 insertions, 15 deletions
@@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.90 2017/11/02 14:53:02 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.91 2017/11/10 23:42:52 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -111,7 +111,7 @@ 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, int); -static struct termp *pspdf_alloc(const struct manoutput *); +static struct termp *pspdf_alloc(const struct manoutput *, enum termtype); static void pdf_obj(struct termp *, size_t); /* @@ -514,27 +514,17 @@ static const struct font fonts[TERMFONT__MAX] = { void * pdf_alloc(const struct manoutput *outopts) { - struct termp *p; - - if (NULL != (p = pspdf_alloc(outopts))) - p->type = TERMTYPE_PDF; - - return p; + return pspdf_alloc(outopts, TERMTYPE_PDF); } void * ps_alloc(const struct manoutput *outopts) { - struct termp *p; - - if (NULL != (p = pspdf_alloc(outopts))) - p->type = TERMTYPE_PS; - - return p; + return pspdf_alloc(outopts, TERMTYPE_PS); } static struct termp * -pspdf_alloc(const struct manoutput *outopts) +pspdf_alloc(const struct manoutput *outopts, enum termtype type) { struct termp *p; unsigned int pagex, pagey; @@ -544,6 +534,7 @@ pspdf_alloc(const struct manoutput *outopts) p = mandoc_calloc(1, sizeof(*p)); p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol)); p->maxtcol = 1; + p->type = type; p->enc = TERMENC_ASCII; p->fontq = mandoc_reallocarray(NULL, |