summaryrefslogtreecommitdiffstats
path: root/private.h
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-01-15 17:38:57 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-01-15 17:38:57 +0000
commit49aead8ab67de188578d52298d35707f7a62a695 (patch)
tree2a01361f65d5a4fb73dc96b290c5c0c664d2a12f /private.h
parentfbf268cbe56d069d49e3960a6a269662a47bbd79 (diff)
downloadmandoc-49aead8ab67de188578d52298d35707f7a62a695.tar.gz
Broken build (changing err/warn/msg function prototypes for clarity).
Diffstat (limited to 'private.h')
-rw-r--r--private.h66
1 files changed, 47 insertions, 19 deletions
diff --git a/private.h b/private.h
index 9b716559..751c0617 100644
--- a/private.h
+++ b/private.h
@@ -45,31 +45,59 @@ struct mdoc {
int ppos, int *pos, char *buf
struct mdoc_macro {
- int (*fp)(MACRO_PROT_ARGS);
- int flags;
-#define MDOC_CALLABLE (1 << 0)
-#define MDOC_PARSED (1 << 1)
-#define MDOC_EXPLICIT (1 << 2)
-#define MDOC_QUOTABLE (1 << 3)
-#define MDOC_PROLOGUE (1 << 4)
-#define MDOC_TABSEP (1 << 5)
+ int (*fp)(MACRO_PROT_ARGS);
+ int flags;
+#define MDOC_CALLABLE (1 << 0)
+#define MDOC_PARSED (1 << 1)
+#define MDOC_EXPLICIT (1 << 2)
+#define MDOC_QUOTABLE (1 << 3)
+#define MDOC_PROLOGUE (1 << 4)
+#define MDOC_TABSEP (1 << 5)
};
+#define mdoc_nwarn(mdoc, node, type, fmt, ...) \
+ mdoc_vwarn((mdoc), (node)->line, \
+ (node)->pos, (type), (fmt), ##__VA_ARGS__)
+
+#define mdoc_nerr(mdoc, node, fmt, ...) \
+ mdoc_verr((mdoc), (node)->line, \
+ (node)->pos, (fmt), ##__VA_ARGS__)
+
+#define mdoc_warn(mdoc, type, fmt, ...) \
+ mdoc_vwarn((mdoc), (mdoc)->last->line, \
+ (mdoc)->last->pos, (type), (fmt), ##__VA_ARGS__)
+
+#define mdoc_err(mdoc, fmt, ...) \
+ mdoc_verr((mdoc), (mdoc)->last->line, \
+ (mdoc)->last->pos, (fmt), ##__VA_ARGS__)
+
+#define mdoc_msg(mdoc, fmt, ...) \
+ mdoc_vmsg((mdoc), (mdoc)->last->line, \
+ (mdoc)->last->pos, (fmt), ##__VA_ARGS__)
+
+#define mdoc_pmsg(mdoc, line, pos, fmt, ...) \
+ mdoc_vmsg((mdoc), (line), \
+ (pos), (fmt), ##__VA_ARGS__)
+
+#define mdoc_pwarn(mdoc, line, pos, type, fmt, ...) \
+ mdoc_vwarn((mdoc), (line), \
+ (pos), (type), (fmt), ##__VA_ARGS__)
+
+#define mdoc_perr(mdoc, line, pos, fmt, ...) \
+ mdoc_verr((mdoc), (line), \
+ (pos), (fmt), ##__VA_ARGS__)
+
extern const struct mdoc_macro *const mdoc_macros;
__BEGIN_DECLS
-#define mdoc_vwarn(m, n, t) \
- mdoc_pwarn((m), (n)->line, (n)->pos, (t))
-#define mdoc_verr(m, n, t) \
- mdoc_perr((m), (n)->line, (n)->pos, (t))
-#define mdoc_warn(m, t) \
- mdoc_pwarn((m), (m)->last->line, (m)->last->pos, (t))
-#define mdoc_err(m, t) \
- mdoc_perr((m), (m)->last->line, (m)->last->pos, (t))
-int mdoc_pwarn(struct mdoc *, int, int, enum mdoc_warn);
-int mdoc_perr(struct mdoc *, int, int, enum mdoc_err);
-void mdoc_msg(struct mdoc *, const char *, ...);
+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_macro(MACRO_PROT_ARGS);
int mdoc_find(const struct mdoc *, const char *);
int mdoc_word_alloc(struct mdoc *,