summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/man_macro.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2010-12-01 23:02:57 +0000
committerschwarze <schwarze@openbsd.org>2010-12-01 23:02:57 +0000
commit8dc07b1e5b7328d427a8f5fb8184bdd32a1bd69a (patch)
treed631a9acd00d6306bb608fb7a66b626c3d13a13e /usr.bin/mandoc/man_macro.c
parentMerge mdoc_action.c into mdoc_validate.c, because having two places to do (diff)
downloadwireguard-openbsd-8dc07b1e5b7328d427a8f5fb8184bdd32a1bd69a.tar.xz
wireguard-openbsd-8dc07b1e5b7328d427a8f5fb8184bdd32a1bd69a.zip
Merge man_action.c into man_validate.c.
Same as for mdoc_action.c, but much simpler. Work by kristaps@, re-applying OpenBSD changes on top.
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
-rw-r--r--usr.bin/mandoc/man_macro.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index f226db507b3..6fb329a209c 100644
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.23 2010/11/29 02:26:45 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.24 2010/12/01 23:02:59 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -119,8 +119,6 @@ man_unscope(struct man *m, const struct man_node *n,
return(0);
if ( ! man_valid_post(m))
return(0);
- if ( ! man_action_post(m))
- return(0);
m->last = m->last->parent;
assert(m->last);
}
@@ -129,8 +127,6 @@ man_unscope(struct man *m, const struct man_node *n,
return(0);
if ( ! man_valid_post(m))
return(0);
- if ( ! man_action_post(m))
- return(0);
m->next = MAN_ROOT == m->last->type ?
MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
@@ -457,8 +453,6 @@ in_line_eoln(MACRO_PROT_ARGS)
break;
if ( ! man_valid_post(m))
return(0);
- if ( ! man_action_post(m))
- return(0);
}
assert(m->last);
@@ -469,8 +463,6 @@ in_line_eoln(MACRO_PROT_ARGS)
if (m->last->type != MAN_ROOT && ! man_valid_post(m))
return(0);
- if (m->last->type != MAN_ROOT && ! man_action_post(m))
- return(0);
m->next = MAN_ROOT == m->last->type ?
MAN_NEXT_CHILD : MAN_NEXT_SIBLING;