From 115a33d8b5b4a3cc8361aceda5ad0503ae4d6e42 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Fri, 21 Aug 2009 13:45:33 +0000 Subject: Fix of MAN_NEXT when removing next-line dupes. --- man.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/man.c b/man.c index 5763c9ea..8fcb8ef9 100644 --- a/man.c +++ b/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.36 2009/08/21 13:18:32 kristaps Exp $ */ +/* $Id: man.c,v 1.37 2009/08/21 13:45:33 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -378,14 +378,15 @@ man_node_free(struct man_node *p) void man_node_freelist(struct man_node *p) { + struct man_node *n; if (p->child) man_node_freelist(p->child); - if (p->next) - man_node_freelist(p->next); - assert(0 == p->nchild); + n = p->next; man_node_free(p); + if (n) + man_node_freelist(n); } @@ -526,6 +527,7 @@ man_pmacro(struct man *m, int ln, char *buf) if (m->flags & MAN_ELINE) { n = m->last; assert(NULL == n->child); + assert(0 == n->nchild); if ( ! man_nwarn(m, n, WLNSCOPE)) return(0); @@ -534,10 +536,12 @@ man_pmacro(struct man *m, int ln, char *buf) assert(n == n->prev->next); n->prev->next = NULL; m->last = n->prev; + m->next = MAN_NEXT_SIBLING; } else { assert(n == n->parent->child); n->parent->child = NULL; m->last = n->parent; + m->next = MAN_NEXT_CHILD; } man_node_free(n); -- cgit v1.2.3-56-ge451