Complete the whatis.1 -> apropos.1 merge,

[mandoc.git] / libmandoc.h

diff --git a/libmandoc.h b/libmandoc.h
index c6ececf51b0c0d4a54f26b7f8ffd945e25850f22..1011cc50214750da253dbeb8005c3f730de5b19f 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmandoc.h,v 1.40 2014/03/19 21:51:20 schwarze Exp $ */
+/*     $Id: libmandoc.h,v 1.42 2014/07/09 11:31:43 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -36,12 +36,12 @@ struct      roff;
 struct mdoc;
 struct man;
 
 struct mdoc;
 struct man;
 

-void            mandoc_msg(enum mandocerr, struct mparse *, 
+void            mandoc_msg(enum mandocerr, struct mparse *,

                        int, int, const char *);
 #if __GNUC__ - 0 >= 4
 __attribute__((__format__ (__printf__, 5, 6)))
 #endif
                        int, int, const char *);
 #if __GNUC__ - 0 >= 4
 __attribute__((__format__ (__printf__, 5, 6)))
 #endif

-void            mandoc_vmsg(enum mandocerr, struct mparse *, 
+void            mandoc_vmsg(enum mandocerr, struct mparse *,

                        int, int, const char *, ...);
 char           *mandoc_getarg(struct mparse *, char **, int, int *);
 char           *mandoc_normdate(struct mparse *, char *, int, int);
                        int, int, const char *, ...);
 char           *mandoc_getarg(struct mparse *, char **, int, int *);
 char           *mandoc_normdate(struct mparse *, char *, int, int);


@@ -49,36 +49,37 @@ int          mandoc_eos(const char *, size_t);
 int             mandoc_strntoi(const char *, size_t, int);
 const char     *mandoc_a2msec(const char*);
 
 int             mandoc_strntoi(const char *, size_t, int);
 const char     *mandoc_a2msec(const char*);
 

-void            mdoc_free(struct mdoc *);
-struct mdoc    *mdoc_alloc(struct roff *, struct mparse *, char *, int);
+void            mdoc_free(struct mdoc *);
+struct mdoc    *mdoc_alloc(struct roff *, struct mparse *,
+                       const char *, int);

 void            mdoc_reset(struct mdoc *);
 void            mdoc_reset(struct mdoc *);

-int             mdoc_parseln(struct mdoc *, int, char *, int);
+int             mdoc_parseln(struct mdoc *, int, char *, int);

 int             mdoc_endparse(struct mdoc *);
 int             mdoc_addspan(struct mdoc *, const struct tbl_span *);
 int             mdoc_addeqn(struct mdoc *, const struct eqn *);
 
 int             mdoc_endparse(struct mdoc *);
 int             mdoc_addspan(struct mdoc *, const struct tbl_span *);
 int             mdoc_addeqn(struct mdoc *, const struct eqn *);
 

-void            man_free(struct man *);
+void            man_free(struct man *);

 struct man     *man_alloc(struct roff *, struct mparse *, int);
 void            man_reset(struct man *);
 struct man     *man_alloc(struct roff *, struct mparse *, int);
 void            man_reset(struct man *);

-int             man_parseln(struct man *, int, char *, int);
+int             man_parseln(struct man *, int, char *, int);

 int             man_endparse(struct man *);
 int             man_addspan(struct man *, const struct tbl_span *);
 int             man_addeqn(struct man *, const struct eqn *);
 
 int             man_endparse(struct man *);
 int             man_addspan(struct man *, const struct tbl_span *);
 int             man_addeqn(struct man *, const struct eqn *);
 

-void            roff_free(struct roff *);
+void            roff_free(struct roff *);

 struct roff    *roff_alloc(struct mparse *, int);
 void            roff_reset(struct roff *);
 struct roff    *roff_alloc(struct mparse *, int);
 void            roff_reset(struct roff *);

-enum rofferr    roff_parseln(struct roff *, int, 
+enum rofferr    roff_parseln(struct roff *, int,

                        char **, size_t *, int, int *);
 void            roff_endparse(struct roff *);
 void            roff_setreg(struct roff *, const char *, int, char sign);
 int             roff_getreg(const struct roff *, const char *);
 char           *roff_strdup(const struct roff *, const char *);
                        char **, size_t *, int, int *);
 void            roff_endparse(struct roff *);
 void            roff_setreg(struct roff *, const char *, int, char sign);
 int             roff_getreg(const struct roff *, const char *);
 char           *roff_strdup(const struct roff *, const char *);

-int             roff_getcontrol(const struct roff *, 
+int             roff_getcontrol(const struct roff *,

                        const char *, int *);
 #if 0
 char            roff_eqndelim(const struct roff *);
                        const char *, int *);
 #if 0
 char            roff_eqndelim(const struct roff *);

-void            roff_openeqn(struct roff *, const char *, 
+void            roff_openeqn(struct roff *, const char *,

                        int, int, const char *);
 int             roff_closeeqn(struct roff *);
 #endif
                        int, int, const char *);
 int             roff_closeeqn(struct roff *);
 #endif