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 | 80339b751a1833d9bbbf9856e7f48f56d91ba1d3 (patch) | |
| tree | 4e59124e25202b7fa3543b670ae8434c1256cd45 /libmandoc.h | |
| parent | 7ff718a5d9d20e97b6431bb61dc4cb34a1f431c7 (diff) | |
| download | mandoc-80339b751a1833d9bbbf9856e7f48f56d91ba1d3.tar.gz | |
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 'libmandoc.h')
| -rw-r--r-- | libmandoc.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libmandoc.h b/libmandoc.h index f7a54f2b..2cdd1095 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -19,12 +19,16 @@ __BEGIN_DECLS -int mandoc_special(char *); -char *mandoc_strdup(const char *); -char *mandoc_getarg(char **, mandocmsg, void *, int, int *); -char *mandoc_normdate(char *, mandocmsg, void *, int, int); -int mandoc_eos(const char *, size_t, int); -int mandoc_hyph(const char *, const char *); +void mandoc_msg(enum mandocerr, struct mparse *, + int, int, const char *); +void mandoc_vmsg(enum mandocerr, struct mparse *, + int, int, const char *, ...); +int mandoc_special(char *); +char *mandoc_strdup(const char *); +char *mandoc_getarg(struct mparse *, char **, int, int *); +char *mandoc_normdate(struct mparse *, char *, int, int); +int mandoc_eos(const char *, size_t, int); +int mandoc_hyph(const char *, const char *); __END_DECLS |