Put tbl_alloc function right into the addspan() one, as this is the only

place that it's called.

diff --git a/man.c b/man.c
index 1a6807efafb704293f8d114e477b2a450ddf239d..3a217af36277565259e822f1bfb918334b1cc4a1 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.99 2011/02/06 22:05:20 kristaps Exp $ */
+/*     $Id: man.c,v 1.100 2011/02/08 07:40:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -48,8 +48,6 @@ static        struct man_node *man_node_alloc(struct man *, int, int,
                                enum man_type, enum mant);
 static int              man_node_append(struct man *, 
                                struct man_node *);
-static int              man_span_alloc(struct man *, 
-                               const struct tbl_span *);
 static void             man_node_free(struct man_node *);
 static void             man_node_unlink(struct man *, 
                                struct man_node *);
@@ -300,21 +298,6 @@ man_block_alloc(struct man *m, int line, int pos, enum mant tok)
        return(1);
 }
 
-static int
-man_span_alloc(struct man *m, const struct tbl_span *span)
-{
-       struct man_node *n;
-
-       n = man_node_alloc(m, span->line, 0, MAN_TBL, MAN_MAX);
-       n->span = span;
-
-       if ( ! man_node_append(m, n))
-               return(0);
-
-       m->next = MAN_NEXT_SIBLING;
-       return(1);
-}
-
 int
 man_word_alloc(struct man *m, int line, int pos, const char *word)
 {
@@ -367,10 +350,17 @@ man_node_delete(struct man *m, struct man_node *p)
 int
 man_addspan(struct man *m, const struct tbl_span *sp)
 {
+       struct man_node *n;
 
        assert( ! (MAN_HALT & m->flags));
-       if ( ! man_span_alloc(m, sp))
+
+       n = man_node_alloc(m, sp->line, 0, MAN_TBL, MAN_MAX);
+       n->span = sp;
+
+       if ( ! man_node_append(m, n))
                return(0);
+
+       m->next = MAN_NEXT_SIBLING;
        return(man_descope(m, sp->line, 0));
 }
 

diff --git a/mdoc.c b/mdoc.c
index ddc2198cf60a1d404b4e8a352559a389a7349569..a1d3db3d5c43aa2c5251291c06a1bfe125f74e37 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.179 2011/02/06 22:05:20 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.180 2011/02/08 07:40:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -98,9 +98,6 @@ static        int               node_append(struct mdoc *,
                                struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
-static int               mdoc_span_alloc(struct mdoc *, 
-                               const struct tbl_span *);
-
 
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
@@ -227,6 +224,7 @@ mdoc_endparse(struct mdoc *m)
 int
 mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
 {
+       struct mdoc_node *n;
 
        assert( ! (MDOC_HALT & m->flags));
 
@@ -237,7 +235,14 @@ mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
                return(1);
        }
 
-       return(mdoc_span_alloc(m, sp));
+       n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL);
+       n->span = sp;
+
+       if ( ! node_append(m, n))
+               return(0);
+
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
 }
 
 
@@ -545,22 +550,6 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
        return(1);
 }
 
-static int
-mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp)
-{
-       struct mdoc_node *n;
-
-       n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL);
-       n->span = sp;
-
-       if ( ! node_append(m, n))
-               return(0);
-
-       m->next = MDOC_NEXT_SIBLING;
-       return(1);
-}
-
-
 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 {