From dc649a73f967c1a61e60d2495f16d56db82eac57 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 27 Jun 2010 15:52:41 +0000 Subject: Downstream maintainers: this removes UGLY! I don't want diverging functionality and UGLY works quite well thanks to schwarze@'s careful attention. This also backs out function-prototype changes for struct regset, instead stuffing a pointer to the regset directly into struct mdoc/man/roff. --- mdoc.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'mdoc.h') diff --git a/mdoc.h b/mdoc.h index dc4be587..19e52e23 100644 --- a/mdoc.h +++ b/mdoc.h @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.92 2010/06/26 15:36:37 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.93 2010/06/27 15:52:41 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -303,10 +303,9 @@ struct mdoc_node { #define MDOC_LINE (1 << 3) /* first macro/text on line */ enum mdoc_type type; /* AST node type */ enum mdoc_sec sec; /* current named section */ + /* FIXME: these can be union'd to shave a few bytes. */ struct mdoc_arg *args; /* BLOCK/ELEM */ -#ifdef UGLY struct mdoc_node *pending; /* BLOCK */ -#endif struct mdoc_node *head; /* BLOCK */ struct mdoc_node *body; /* BLOCK */ struct mdoc_node *tail; /* BLOCK */ @@ -334,11 +333,9 @@ struct mdoc; /* See mdoc.3 for documentation. */ void mdoc_free(struct mdoc *); -struct mdoc *mdoc_alloc(void *, int, mandocmsg); +struct mdoc *mdoc_alloc(const struct regset *, void *, int, mandocmsg); void mdoc_reset(struct mdoc *); -int mdoc_parseln(struct mdoc *, - const struct regset *, - int, char *, int); +int mdoc_parseln(struct mdoc *, int, char *, int); const struct mdoc_node *mdoc_node(const struct mdoc *); const struct mdoc_meta *mdoc_meta(const struct mdoc *); int mdoc_endparse(struct mdoc *); -- cgit v1.2.3