From 989816d8fc5b18f79f44f088cf52a45b02ee6b31 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Thu, 21 Apr 2011 22:59:55 +0000 Subject: Merge version 1.10.10: lots of cleanup and maintenance work by kristaps@. - move some main.c globals into struct curparse - move mandoc_*alloc to mandoc.h such that all code can use them - make mandoc_isdelim available to formatting frontends - dissolve mdoc_strings.c, move the code where it is used - make all error reporting functions void, their return values were useless - and various minor cleanups and fixes --- usr.bin/mandoc/out.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.bin/mandoc/out.c') diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c index 7f2344adf1a..48e3b3c5c8b 100644 --- a/usr.bin/mandoc/out.c +++ b/usr.bin/mandoc/out.c @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.12 2011/01/30 16:05:29 schwarze Exp $ */ +/* $Id: out.c,v 1.13 2011/04/21 22:59:54 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -427,7 +427,8 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp) */ assert(NULL == tbl->cols); - tbl->cols = calloc(sp->tbl->cols, sizeof(struct roffcol)); + tbl->cols = mandoc_calloc + ((size_t)sp->tbl->cols, sizeof(struct roffcol)); hp = sp->head; -- cgit v1.2.3