diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-04-18 16:04:41 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-04-18 16:04:41 +0000 |
| commit | 4acc328420d73769e9005abd2f350a67fe1e6ebc (patch) | |
| tree | 3ba777440105dec5ac0963f448b3fba02fb4bb65 /usr.bin/mandoc/read.c | |
| parent | 59652e050a8311d8419f5727c476f3f1fdb9a293 (diff) | |
Replace the structs mdoc and man by a unified struct roff_man.
Almost completely mechanical, no functional change.
Written on the train from Exeter to London returning from p2k15.
Diffstat (limited to 'usr.bin/mandoc/read.c')
| -rw-r--r-- | usr.bin/mandoc/read.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index 49c2aa1b475..53694145f81 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.108 2015/04/02 21:03:18 schwarze Exp $ */ +/* $OpenBSD: read.c,v 1.109 2015/04/18 16:04:40 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -42,10 +42,10 @@ #define REPARSE_LIMIT 1000 struct mparse { - struct man *pman; /* persistent man parser */ - struct mdoc *pmdoc; /* persistent mdoc parser */ - struct man *man; /* man parser */ - struct mdoc *mdoc; /* mdoc parser */ + struct roff_man *pman; /* persistent man parser */ + struct roff_man *pmdoc; /* persistent mdoc parser */ + struct roff_man *man; /* man parser */ + struct roff_man *mdoc; /* mdoc parser */ struct roff *roff; /* roff parser (!NULL) */ const struct mchars *mchars; /* character table */ char *sodest; /* filename pointed to by .so */ @@ -930,8 +930,8 @@ mparse_free(struct mparse *curp) } void -mparse_result(struct mparse *curp, - struct mdoc **mdoc, struct man **man, char **sodest) +mparse_result(struct mparse *curp, struct roff_man **mdoc, + struct roff_man **man, char **sodest) { if (sodest && NULL != (*sodest = curp->sodest)) { |