From 56cfcaa84d0b04041aeeec950bddb179297ebd2d Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 2 Jan 2011 10:10:57 +0000 Subject: Churn to get parts of 'struct tbl' visible from mandoc.h: rename the existing 'struct tbl' as 'struct tbl_node', then move all option stuff into a 'struct tbl' in mandoc.h. This conflicted with a structure in chars.c, which was renamed. --- roff.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'roff.c') diff --git a/roff.c b/roff.c index 8ea194e7..65989cd1 100644 --- a/roff.c +++ b/roff.c @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.117 2011/01/01 16:18:39 kristaps Exp $ */ +/* $Id: roff.c,v 1.118 2011/01/02 10:10:57 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -86,9 +86,9 @@ struct roff { struct regset *regs; /* read/writable registers */ struct roffstr *first_string; /* user-defined strings & macros */ const char *current_string; /* value of last called user macro */ - struct tbl *first_tbl; /* first table parsed */ - struct tbl *last_tbl; /* last table parsed */ - struct tbl *tbl; /* current table being parsed */ + struct tbl_node *first_tbl; /* first table parsed */ + struct tbl_node *last_tbl; /* last table parsed */ + struct tbl_node *tbl; /* current table being parsed */ }; struct roffnode { @@ -301,7 +301,7 @@ roffnode_push(struct roff *r, enum rofft tok, const char *name, static void roff_free1(struct roff *r) { - struct tbl *t; + struct tbl_node *t; while (r->first_tbl) { t = r->first_tbl; @@ -1152,7 +1152,7 @@ roff_T_(ROFF_ARGS) static enum rofferr roff_TS(ROFF_ARGS) { - struct tbl *t; + struct tbl_node *t; if (r->tbl) { (*r->msg)(MANDOCERR_SCOPEBROKEN, r->data, ln, ppos, NULL); -- cgit v1.2.3