diff options
-rw-r--r-- | libmdoc.h | 6 | ||||
-rw-r--r-- | main.c | 1 | ||||
-rw-r--r-- | mdoc.c | 49 | ||||
-rw-r--r-- | mdoc.h | 1 |
4 files changed, 1 insertions, 56 deletions
@@ -61,20 +61,16 @@ __BEGIN_DECLS /* * When GCC2 is deprecated, most of these can be reverted to #define - * as mdoc_vmsg using __VA_ARGS__. Until then, use real functions. + * as mdoc_vXXX using __VA_ARGS__. Until then, use real functions. */ int mdoc_vwarn(struct mdoc *, int, int, enum mdoc_warn, const char *, ...); -void mdoc_vmsg(struct mdoc *, int, int, - const char *, ...); int mdoc_verr(struct mdoc *, int, int, const char *, ...); int mdoc_nerr(struct mdoc *, const struct mdoc_node *, const char *, ...); int mdoc_warn(struct mdoc *, enum mdoc_warn, const char *, ...); int mdoc_err(struct mdoc *, const char *, ...); -void mdoc_msg(struct mdoc *, const char *, ...); -void mdoc_pmsg(struct mdoc *, int, int, const char *, ...); int mdoc_pwarn(struct mdoc *, int, int, enum mdoc_warn,const char *, ...); int mdoc_perr(struct mdoc *, int, int, const char *, ...); @@ -259,7 +259,6 @@ mdoc_init(struct curparse *curp) struct mdoc *mdoc; struct mdoc_cb mdoccb; - mdoccb.mdoc_msg = NULL; mdoccb.mdoc_err = merr; mdoccb.mdoc_warn = mdocwarn; @@ -242,22 +242,6 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf) } -void -mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) -{ - char buf[256]; - va_list ap; - - if (NULL == mdoc->cb.mdoc_msg) - return; - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - (*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf); -} - - int mdoc_verr(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) @@ -342,39 +326,6 @@ mdoc_err(struct mdoc *mdoc, const char *fmt, ...) } -void -mdoc_msg(struct mdoc *mdoc, const char *fmt, ...) -{ - char buf[256]; - va_list ap; - - if (NULL == mdoc->cb.mdoc_msg) - return; - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - (*mdoc->cb.mdoc_msg)(mdoc->data, mdoc->last->line, mdoc->last->pos, - buf); -} - - -void -mdoc_pmsg(struct mdoc *mdoc, int line, int pos, const char *fmt, ...) -{ - char buf[256]; - va_list ap; - - if (NULL == mdoc->cb.mdoc_msg) - return; - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - (*mdoc->cb.mdoc_msg)(mdoc->data, line, pos, buf); -} - - int mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum mdoc_warn type, const char *fmt, ...) @@ -278,7 +278,6 @@ struct mdoc_node { /* Call-backs for parse messages. */ struct mdoc_cb { - void (*mdoc_msg)(void *, int, int, const char *); int (*mdoc_err)(void *, int, int, const char *); int (*mdoc_warn)(void *, int, int, enum mdoc_warn, const char *); |