diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2018-12-14 06:33:14 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-14 06:33:14 +0000 |
| commit | 4c2762423e7dcaf40f505c9000f23b6f18a484e5 (patch) | |
| tree | 506be8e4f33431f64d95bfecad57d08f20be9dba /libmandoc.h | |
| parent | 7a6eb8920bdea2ecc151b308352b2a98699b2350 (diff) | |
| download | mandoc-4c2762423e7dcaf40f505c9000f23b6f18a484e5.tar.gz mandoc-4c2762423e7dcaf40f505c9000f23b6f18a484e5.tar.zst mandoc-4c2762423e7dcaf40f505c9000f23b6f18a484e5.zip | |
Cleanup, no functional change:
Now that message handling is properly encapsulated,
remove struct mparse pointers from four structs (roff, roff_man,
tbl_node, eqn_node) and from the argument lists of five functions
(roff_alloc, roff_man_alloc, mandoc_getarg, tbl_alloc, eqn_alloc).
Except for being passed to the main program as an opaque object,
it now only occurs in read.c, as it should, and not across 15 files
like in the past.
Diffstat (limited to 'libmandoc.h')
| -rw-r--r-- | libmandoc.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libmandoc.h b/libmandoc.h index e2452f3e..d56ca1b6 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -1,4 +1,4 @@ -/* $Id: libmandoc.h,v 1.75 2018/12/14 01:18:25 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.76 2018/12/14 06:33:14 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> @@ -45,11 +45,10 @@ struct buf { }; -struct mparse; struct roff; struct roff_man; -char *mandoc_getarg(struct mparse *, char **, int, int *); +char *mandoc_getarg(char **, int, int *); char *mandoc_normdate(struct roff_man *, char *, int, int); int mandoc_eos(const char *, size_t); int mandoc_strntoi(const char *, size_t, int); @@ -66,11 +65,10 @@ 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 *); void roff_userret(struct roff *); |