diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-20 16:02:05 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-20 16:02:05 +0000 |
| commit | 71ddcd873082a3c68ed2be7b7661075fb09d5849 (patch) | |
| tree | 7eb75a067079e8a591b76791b56f0b7673b109d5 /tbl_data.c | |
| parent | 58ca7d3112e5d39b93ab732cf103b4b0b834b106 (diff) | |
| download | mandoc-71ddcd873082a3c68ed2be7b7661075fb09d5849.tar.gz mandoc-71ddcd873082a3c68ed2be7b7661075fb09d5849.tar.zst mandoc-71ddcd873082a3c68ed2be7b7661075fb09d5849.zip | |
Consolidate messages. Have all parse-time messages (in libmdoc,
libroff, etc., etc.) route into mandoc_msg() and mandoc_vmsg(), for the
time being in libmandoc.h. This requires struct mparse to be passed
into the allocation routines instead of mandocmsg and a void pointer.
Then, move some of the functionality of the old mmsg() into read.c's
mparse_mmsg() (check against wlevel and setting of file_status) and use
main.c's mmsg() as simply a printing tool.
Diffstat (limited to 'tbl_data.c')
| -rw-r--r-- | tbl_data.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.23 2011/03/15 16:23:51 kristaps Exp $ */ +/* $Id: tbl_data.c,v 1.24 2011/03/20 16:02:05 kristaps Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -64,7 +64,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp, */ if (NULL == cp) { - TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); + mandoc_msg(MANDOCERR_TBLEXTRADAT, + tbl->parse, ln, *pos, NULL); /* Skip to the end... */ while (p[*pos]) (*pos)++; @@ -130,7 +131,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp, TBL_CELL_DHORIZ == dat->layout->pos || TBL_CELL_DOWN == dat->layout->pos) if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) - TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); + mandoc_msg(MANDOCERR_TBLIGNDATA, + tbl->parse, ln, sv, NULL); return(1); } @@ -172,7 +174,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p) dat->string = mandoc_strdup(p); if (TBL_CELL_DOWN == dat->layout->pos) - TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos); + mandoc_msg(MANDOCERR_TBLIGNDATA, + tbl->parse, ln, pos, NULL); return(0); } @@ -210,7 +213,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) pos = 0; if ('\0' == p[pos]) { - TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); + mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL); return(0); } |