diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-01-08 17:48:04 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-01-08 17:48:04 +0000 |
| commit | 30e5ee0603ba55c62e39e52e29f67681cf1fdce2 (patch) | |
| tree | dc5034d61098367dc7e0b3d473a1980d9995f001 /usr.bin/mandoc/man_validate.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-30e5ee0603ba55c62e39e52e29f67681cf1fdce2.tar.xz wireguard-openbsd-30e5ee0603ba55c62e39e52e29f67681cf1fdce2.zip | |
Delete the redundant "nchild" member of struct roff_node, replacing
most uses by one, a few by two pointer checks, and only one by a
tiny loop - not only making data smaller, but code shorter as well.
This gets rid of an implicit invariant that confused both static
analysis tools and human auditors. No functional change.
Diffstat (limited to 'usr.bin/mandoc/man_validate.c')
| -rw-r--r-- | usr.bin/mandoc/man_validate.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c index 1f05b4c5404..067f4a3a885 100644 --- a/usr.bin/mandoc/man_validate.c +++ b/usr.bin/mandoc/man_validate.c @@ -1,7 +1,7 @@ -/* $OpenBSD: man_validate.c,v 1.92 2015/10/22 21:53:49 schwarze Exp $ */ +/* $OpenBSD: man_validate.c,v 1.93 2016/01/08 17:48:04 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -178,10 +178,10 @@ static void post_OP(CHKARGS) { - if (n->nchild == 0) + if (n->child == NULL) mandoc_msg(MANDOCERR_OP_EMPTY, man->parse, n->line, n->pos, "OP"); - else if (n->nchild > 2) { + else if (n->child->next != NULL && n->child->next->next != NULL) { n = n->child->next->next; mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, n->line, n->pos, "OP ... %s", n->string); @@ -204,7 +204,7 @@ post_ft(CHKARGS) char *cp; int ok; - if (0 == n->nchild) + if (n->child == NULL) return; ok = 0; @@ -254,22 +254,22 @@ check_par(CHKARGS) switch (n->type) { case ROFFT_BLOCK: - if (0 == n->body->nchild) + if (n->body->child == NULL) roff_node_delete(man, n); break; case ROFFT_BODY: - if (0 == n->nchild) + if (n->child == NULL) mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos, "%s empty", man_macronames[n->tok]); break; case ROFFT_HEAD: - if (n->nchild) + if (n->child != NULL) mandoc_vmsg(MANDOCERR_ARG_SKIP, man->parse, n->line, n->pos, "%s %s%s", man_macronames[n->tok], n->child->string, - n->nchild > 1 ? " ..." : ""); + n->child->next != NULL ? " ..." : ""); break; default: break; @@ -282,11 +282,11 @@ post_IP(CHKARGS) switch (n->type) { case ROFFT_BLOCK: - if (0 == n->head->nchild && 0 == n->body->nchild) + if (n->head->child == NULL && n->body->child == NULL) roff_node_delete(man, n); break; case ROFFT_BODY: - if (0 == n->parent->head->nchild && 0 == n->nchild) + if (n->parent->head->child == NULL && n->child == NULL) mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos, "%s empty", man_macronames[n->tok]); |