two typos; patch from Raf Czlonka <rczlonka at gmail dot com>

[mandoc.git] / libmandoc.h

diff --git a/libmandoc.h b/libmandoc.h
index edc0e7fa0df1d2bfc81b139914f7a8ecd6daf37e..ab7c29be510f3f986a990b9dc07fdcbb786460e8 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: libmandoc.h,v 1.74 2018/08/24 23:12:33 schwarze Exp $ */
+/* $Id: libmandoc.h,v 1.80 2021/06/27 17:57:54 schwarze Exp $ */
 /*
+ * Copyright (c) 2013-2015,2017,2018,2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,9 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Internal interfaces for parser utilities needed by multiple parsers
+ * and the top-level functions to call the mdoc, man, and roff parsers.
  */
 
 /*
@@ -45,17 +48,11 @@ struct      buf {
 };
 
 
-struct mparse;
 struct roff;
 struct roff_man;
+struct roff_node;
 
-void            mandoc_msg(enum mandocerr, struct mparse *,
-                       int, int, const char *);
-void            mandoc_vmsg(enum mandocerr, struct mparse *,
-                       int, int, const char *, ...)
-                       __attribute__((__format__ (__printf__, 5, 6)));
-char           *mandoc_getarg(struct mparse *, char **, int, int *);
-char           *mandoc_normdate(struct roff_man *, char *, int, int);
+char           *mandoc_normdate(struct roff_node *, struct roff_node *);
 int             mandoc_eos(const char *, size_t);
 int             mandoc_strntoi(const char *, size_t, int);
 const char     *mandoc_a2msec(const char*);
@@ -71,18 +68,18 @@ int          preconv_encode(const struct buf *, size_t *,
                        struct buf *, size_t *, int *);
 
 void            roff_free(struct roff *);
-struct roff    *roff_alloc(struct mparse *, int);
+struct roff    *roff_alloc(int);
 void            roff_reset(struct roff *);
 void            roff_man_free(struct roff_man *);
-struct roff_man        *roff_man_alloc(struct roff *, struct mparse *,
-                       const char *, int);
+struct roff_man        *roff_man_alloc(struct roff *, const char *, int);
 void            roff_man_reset(struct roff_man *);
-int             roff_parseln(struct roff *, int, struct buf *, int *);
+int             roff_parseln(struct roff *, int, struct buf *, int *, size_t);
 void            roff_userret(struct roff *);
 void            roff_endparse(struct roff *);
-void            roff_setreg(struct roff *, const char *, int, char sign);
+void            roff_setreg(struct roff *, const char *, int, char);
 int             roff_getreg(struct roff *, const char *);
 char           *roff_strdup(const struct roff *, const char *);
+char           *roff_getarg(struct roff *, char **, int, int *);
 int             roff_getcontrol(const struct roff *,
                        const char *, int *);
 int             roff_getformat(const struct roff *);