From b6f6b7ee15f64b3ab129ecfa179af940f18a258d Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 19 Apr 2015 14:57:38 +0000 Subject: Unify trickier node handling functions. * man_elem_alloc() -> roff_elem_alloc() * man_block_alloc() -> roff_block_alloc() The functions mdoc_elem_alloc() and mdoc_block_alloc() remain for now because they need to do mdoc(7)-specific argument processing. --- man_macro.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'man_macro.c') diff --git a/man_macro.c b/man_macro.c index d82811d4..96d99f67 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.107 2015/04/19 14:25:41 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.108 2015/04/19 14:57:38 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze @@ -259,7 +259,7 @@ blk_exp(MACRO_PROT_ARGS) int la; rew_scope(man, tok); - man_block_alloc(man, line, ppos, tok); + roff_block_alloc(man, line, ppos, tok); head = roff_head_alloc(man, line, ppos, tok); la = *pos; @@ -289,8 +289,7 @@ blk_imp(MACRO_PROT_ARGS) struct roff_node *n; rew_scope(man, tok); - man_block_alloc(man, line, ppos, tok); - n = man->last; + n = roff_block_alloc(man, line, ppos, tok); if (n->tok == MAN_SH || n->tok == MAN_SS) man->flags &= ~MAN_LITERAL; n = roff_head_alloc(man, line, ppos, tok); @@ -329,7 +328,7 @@ in_line_eoln(MACRO_PROT_ARGS) char *p; struct roff_node *n; - man_elem_alloc(man, line, ppos, tok); + roff_elem_alloc(man, line, ppos, tok); n = man->last; for (;;) { -- cgit v1.2.3-56-ge451