diff options
Diffstat (limited to 'contrib/mdocml/libmandoc.h')
| -rw-r--r-- | contrib/mdocml/libmandoc.h | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/contrib/mdocml/libmandoc.h b/contrib/mdocml/libmandoc.h index 3c005e1..1011cc50 100644 --- a/contrib/mdocml/libmandoc.h +++ b/contrib/mdocml/libmandoc.h @@ -1,7 +1,7 @@ -/* $Id: libmandoc.h,v 1.35 2013/12/15 21:23:52 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.42 2014/07/09 11:31:43 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -36,46 +36,50 @@ struct roff; struct mdoc; struct man; -void mandoc_msg(enum mandocerr, struct mparse *, +void mandoc_msg(enum mandocerr, struct mparse *, int, int, const char *); -void mandoc_vmsg(enum mandocerr, struct mparse *, +#if __GNUC__ - 0 >= 4 +__attribute__((__format__ (__printf__, 5, 6))) +#endif +void mandoc_vmsg(enum mandocerr, struct mparse *, int, int, 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_eos(const char *, size_t); int mandoc_strntoi(const char *, size_t, int); const char *mandoc_a2msec(const char*); -void mdoc_free(struct mdoc *); -struct mdoc *mdoc_alloc(struct roff *, struct mparse *, char *); +void mdoc_free(struct mdoc *); +struct mdoc *mdoc_alloc(struct roff *, struct mparse *, + const char *, int); void mdoc_reset(struct mdoc *); -int mdoc_parseln(struct mdoc *, int, char *, int); +int mdoc_parseln(struct mdoc *, int, char *, int); int mdoc_endparse(struct mdoc *); int mdoc_addspan(struct mdoc *, const struct tbl_span *); int mdoc_addeqn(struct mdoc *, const struct eqn *); -void man_free(struct man *); -struct man *man_alloc(struct roff *, struct mparse *); +void man_free(struct man *); +struct man *man_alloc(struct roff *, struct mparse *, int); void man_reset(struct man *); -int man_parseln(struct man *, int, char *, int); +int man_parseln(struct man *, int, char *, int); int man_endparse(struct man *); int man_addspan(struct man *, const struct tbl_span *); int man_addeqn(struct man *, const struct eqn *); -void roff_free(struct roff *); -struct roff *roff_alloc(enum mparset, struct mparse *); +void roff_free(struct roff *); +struct roff *roff_alloc(struct mparse *, int); void roff_reset(struct roff *); -enum rofferr roff_parseln(struct roff *, int, +enum rofferr roff_parseln(struct roff *, int, char **, size_t *, int, int *); void roff_endparse(struct roff *); void roff_setreg(struct roff *, const char *, int, char sign); int roff_getreg(const struct roff *, const char *); char *roff_strdup(const struct roff *, const char *); -int roff_getcontrol(const struct roff *, +int roff_getcontrol(const struct roff *, const char *, int *); #if 0 char roff_eqndelim(const struct roff *); -void roff_openeqn(struct roff *, const char *, +void roff_openeqn(struct roff *, const char *, int, int, const char *); int roff_closeeqn(struct roff *); #endif |
