Deprecated mdoc_msg (not being used anywhere).

diff --git a/libmdoc.h b/libmdoc.h
index 097757cb989f5ccb80584b6ef0fb68189c2ab83a..0606f4c39e23e43f63837b8134c5f7a2144b28c7 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.9 2009/06/15 10:02:52 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.10 2009/06/15 10:36:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 517dbc490a8d8f53e00d5b94ad6527e5a6723313..ce6d4a91a2014d4aee05ae69b30cf9c0ac002d80 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.27 2009/06/11 12:07:49 kristaps Exp $ */
+/*     $Id: main.c,v 1.28 2009/06/15 10:36:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 c9c1e8f19664ab5ff43b0b69c44c575fa39b7e55..c1d07afab78470e040d1dd377b3ac709defa85f6 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.79 2009/06/15 10:02:53 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.80 2009/06/15 10:36:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 a641a352a53868935fe120ddbdeef39a0ab5da5a..c47d7c70342cc6aefe287908654700ae66e586a3 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.57 2009/06/10 20:18:43 kristaps Exp $ */
+/*     $Id: mdoc.h,v 1.58 2009/06/15 10:36:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 *);