summaryrefslogtreecommitdiffstats
path: root/libman.h
diff options
context:
space:
mode:
Diffstat (limited to 'libman.h')
-rw-r--r--libman.h46
1 files changed, 8 insertions, 38 deletions
diff --git a/libman.h b/libman.h
index 0d76b6c7..19738a1b 100644
--- a/libman.h
+++ b/libman.h
@@ -26,7 +26,7 @@ enum man_next {
struct man {
void *data;
- struct man_cb cb;
+ mandocmsg msg;
int pflags; /* parse flags (see man.h) */
int flags; /* parse flags */
#define MAN_HALT (1 << 0) /* badness happened: die */
@@ -41,30 +41,6 @@ struct man {
struct man_meta meta;
};
-enum merr {
- WNPRINT = 0,
- WDATE,
- WLNSCOPE,
- WLNSCOPE2,
- WTSPACE,
- WTQUOTE,
- WNODATA,
- WNOTITLE,
- WESCAPE,
- WNUMFMT,
- WHEADARGS,
- WBODYARGS,
- WNHEADARGS,
- WMACROFORM,
- WEXITSCOPE,
- WNOSCOPE,
- WOLITERAL,
- WNLITERAL,
- WTITLECASE,
- WBADCOMMENT,
- WERRMAX
-};
-
#define MACRO_PROT_ARGS struct man *m, enum mant tok, int line, \
int ppos, int *pos, char *buf
@@ -82,15 +58,10 @@ extern const struct man_macro *const man_macros;
__BEGIN_DECLS
-#define man_perr(m, l, p, t) \
- man_err((m), (l), (p), 1, (t))
-#define man_pwarn(m, l, p, t) \
- man_err((m), (l), (p), 0, (t))
-#define man_nerr(m, n, t) \
- man_err((m), (n)->line, (n)->pos, 1, (t))
-#define man_nwarn(m, n, t) \
- man_err((m), (n)->line, (n)->pos, 0, (t))
-
+#define man_pmsg(m, l, p, t) \
+ (*(m)->msg)((t), (m)->data, (l), (p), NULL)
+#define man_nmsg(m, n, t) \
+ (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
int man_word_alloc(struct man *, int, int, const char *);
int man_block_alloc(struct man *, int, int, enum mant);
int man_head_alloc(struct man *, int, int, enum mant);
@@ -105,15 +76,14 @@ int man_args(struct man *, int, int *, char *, char **);
#define ARGS_EOLN (0)
#define ARGS_WORD (1)
#define ARGS_QWORD (1)
-int man_err(struct man *, int, int, int, enum merr);
-int man_vwarn(struct man *, int, int, const char *, ...);
-int man_verr(struct man *, int, int, const char *, ...);
+int man_vmsg(struct man *, enum mandocerr,
+ int, int, const char *, ...);
int man_valid_post(struct man *);
int man_valid_pre(struct man *, const struct man_node *);
int man_action_post(struct man *);
int man_action_pre(struct man *, struct man_node *);
int man_unscope(struct man *,
- const struct man_node *, enum merr);
+ const struct man_node *, enum mandocerr);
__END_DECLS