summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-06-15 10:36:01 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-06-15 10:36:01 +0000
commitefcbdf615c8624d52ec2a7278d7684bb10f47d15 (patch)
treef929547d85cc4b348ea38a6846ef0a380c039563
parent0ca4962fdcdee1151bf78c0961745c567d1adb6e (diff)
downloadmandoc-efcbdf615c8624d52ec2a7278d7684bb10f47d15.tar.gz
Deprecated mdoc_msg (not being used anywhere).
-rw-r--r--libmdoc.h6
-rw-r--r--main.c1
-rw-r--r--mdoc.c49
-rw-r--r--mdoc.h1
4 files changed, 1 insertions, 56 deletions
diff --git a/libmdoc.h b/libmdoc.h
index a989f951..7c3b9f35 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -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 *, ...);
diff --git a/main.c b/main.c
index aaa757ed..4bece6ac 100644
--- a/main.c
+++ b/main.c
@@ -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;
diff --git a/mdoc.c b/mdoc.c
index e616150c..895bc44f 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -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, ...)
diff --git a/mdoc.h b/mdoc.h
index c5af4a43..62cf0204 100644
--- a/mdoc.h
+++ b/mdoc.h
@@ -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 *);