src - OpenBSD base system

diff options


context:
space:
mode:

author	Ingo Schwarze <schwarze@cvs.openbsd.org>	2016-01-08 17:48:05 +0000
committer	Ingo Schwarze <schwarze@cvs.openbsd.org>	2016-01-08 17:48:05 +0000
commit	acd4f569237dcdcc8fa8acec7b1125a2f37815a4 (patch)
tree	ca5b1689319be7347e802acf8150955a8dad94b2 /usr.bin/mandoc
parent	cf6760ace1c337cbeb0f8b6842d8a4a084627f68 (diff)

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')

-rw-r--r--

usr.bin/mandoc/man_html.c

-rw-r--r--

usr.bin/mandoc/man_macro.c

-rw-r--r--

usr.bin/mandoc/man_term.c

-rw-r--r--

usr.bin/mandoc/man_validate.c

-rw-r--r--

usr.bin/mandoc/mandocdb.c

-rw-r--r--

usr.bin/mandoc/mdoc_html.c

-rw-r--r--

usr.bin/mandoc/mdoc_man.c

-rw-r--r--

usr.bin/mandoc/mdoc_term.c

-rw-r--r--

usr.bin/mandoc/mdoc_validate.c

-rw-r--r--

usr.bin/mandoc/roff.c

-rw-r--r--

usr.bin/mandoc/roff.h

11 files changed, 119 insertions, 123 deletions

diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c
index a1adad2cda1..4fc98977e85 100644
--- a/usr.bin/mandoc/man_html.c
+++ b/usr.bin/mandoc/man_html.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: man_html.c,v 1.72 2015/10/06 18:30:43 schwarze Exp $ */

+/* $OpenBSD: man_html.c,v 1.73 2016/01/08 17:48:04 schwarze Exp $ */

@@ -652,7 +652,7 @@ man_UR_pre(MAN_ARGS)

n = n->child;

assert(n->type == ROFFT_HEAD);

- if (n->nchild) {

+ if (n->child != NULL) {

assert(n->child->type == ROFFT_TEXT);

PAIR_CLASS_INIT(&tag[0], "link-ext");

PAIR_HREF_INIT(&tag[1], n->child->string);

@@ -660,7 +660,7 @@ man_UR_pre(MAN_ARGS)

}

assert(n->next->type == ROFFT_BODY);

- if (n->next->nchild)

+ if (n->next->child != NULL)

n = n->next;

print_man_nodelist(man, n->child, mh, h);

diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index b91a0c30645..b49d9915063 100644
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: man_macro.c,v 1.75 2015/10/22 21:53:49 schwarze Exp $ */

+/* $OpenBSD: man_macro.c,v 1.76 2016/01/08 17:48:04 schwarze Exp $ */

@@ -155,7 +155,7 @@ rew_scope(struct roff_man *man, int tok)

/* Preserve empty paragraphs before RS. */

n = man->last;

- if (tok == MAN_RS && n->nchild == 0 &&

+ if (tok == MAN_RS && n->child == NULL &&

(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP))

return;

diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c
index 3a08cc62f87..488d8193fb8 100644
--- a/usr.bin/mandoc/man_term.c
+++ b/usr.bin/mandoc/man_term.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: man_term.c,v 1.139 2015/10/12 00:07:27 schwarze Exp $ */

+/* $OpenBSD: man_term.c,v 1.140 2016/01/08 17:48:04 schwarze Exp $ */

@@ -217,7 +217,7 @@ static int

pre_ll(DECL_ARGS)

{

- term_setwidth(p, n->nchild ? n->child->string : NULL);

+ term_setwidth(p, n->child != NULL ? n->child->string : NULL);

return 0;

}

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 $ */

* 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]);

diff --git a/usr.bin/mandoc/mandocdb.c b/usr.bin/mandoc/mandocdb.c
index 9a7c456e945..e1b88292069 100644
--- a/usr.bin/mandoc/mandocdb.c
+++ b/usr.bin/mandoc/mandocdb.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: mandocdb.c,v 1.167 2016/01/08 15:01:58 schwarze Exp $ */

+/* $OpenBSD: mandocdb.c,v 1.168 2016/01/08 17:48:04 schwarze Exp $ */

@@ -1424,7 +1424,7 @@ parse_man(struct mpage *mpage, const struct roff_meta *meta,

char byte;

size_t sz;

- if (NULL == n)

+ if (n == NULL)

return;

@@ -1436,13 +1436,12 @@ parse_man(struct mpage *mpage, const struct roff_meta *meta,

if (n->type == ROFFT_BODY && n->tok == MAN_SH) {

body = n;

- assert(body->parent);

- if (NULL != (head = body->parent->head) &&

- 1 == head->nchild &&

- NULL != (head = (head->child)) &&

+ if ((head = body->parent->head) != NULL &&

+ (head = head->child) != NULL &&

+ head->next == NULL &&

head->type == ROFFT_TEXT &&

- 0 == strcmp(head->string, "NAME") &&

- NULL != body->child) {

+ strcmp(head->string, "NAME") == 0 &&

+ body->child != NULL) {

* Suck the entire NAME section into memory.

@@ -1675,7 +1674,9 @@ parse_mdoc_Va(struct mpage *mpage, const struct roff_meta *meta,

if (n->type != ROFFT_ELEM && n->type != ROFFT_BODY)

return 0;

- if (n->nchild == 1 && n->child->type == ROFFT_TEXT)

+ if (n->child != NULL &&

+ n->child->next == NULL &&

+ n->child->type == ROFFT_TEXT)

return 1;

cp = NULL;

diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index b61a3a04e65..2fe3a55081e 100644
--- a/usr.bin/mandoc/mdoc_html.c
+++ b/usr.bin/mandoc/mdoc_html.c

@@ -1,7 +1,7 @@

-/* $OpenBSD: mdoc_html.c,v 1.114 2015/12/25 20:43:04 bentley Exp $ */

+/* $OpenBSD: mdoc_html.c,v 1.115 2016/01/08 17:48:04 schwarze Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

@@ -600,7 +600,7 @@ mdoc_fl_pre(MDOC_ARGS)

print_text(h, "\\-");

- if ( ! (n->nchild == 0 &&

+ if (!(n->child == NULL &&

(n->next == NULL ||

n->next->type == ROFFT_TEXT ||

n->next->flags & MDOC_LINE)))

@@ -977,9 +977,9 @@ mdoc_bl_pre(MDOC_ARGS)

static int

mdoc_ex_pre(MDOC_ARGS)

{

- struct tag *t;

- struct htmlpair tag;

- int nchild;

+ struct htmlpair tag;

+ struct tag *t;

+ struct roff_node *nch;

if (n->prev)

print_otag(h, TAG_BR, 0, NULL);

@@ -988,24 +988,26 @@ mdoc_ex_pre(MDOC_ARGS)

print_text(h, "The");

- nchild = n->nchild;

- for (n = n->child; n; n = n->next) {

- assert(n->type == ROFFT_TEXT);

+ for (nch = n->child; nch != NULL; nch = nch->next) {

+ assert(nch->type == ROFFT_TEXT);

t = print_otag(h, TAG_B, 1, &tag);

- print_text(h, n->string);

+ print_text(h, nch->string);

print_tagq(h, t);

- if (nchild > 2 && n->next) {

+ if (nch->next == NULL)

+ continue;

+ if (nch->prev != NULL || nch->next->next != NULL) {

h->flags |= HTML_NOSPACE;

print_text(h, ",");

}

- if (n->next && NULL == n->next->next)

+ if (nch->next->next == NULL)

print_text(h, "and");

}

- if (nchild > 1)

+ if (n->child != NULL && n->child->next != NULL)

print_text(h, "utilities exit\\~0");

else

print_text(h, "utility exits\\~0");

@@ -1693,37 +1695,36 @@ mdoc_rv_pre(MDOC_ARGS)

{

struct htmlpair tag;

struct tag *t;

- int nchild;

+ struct roff_node *nch;

if (n->prev)

print_otag(h, TAG_BR, 0, NULL);

PAIR_CLASS_INIT(&tag, "fname");

- nchild = n->nchild;

- if (nchild > 0) {

+ if (n->child != NULL) {

print_text(h, "The");

- for (n = n->child; n; n = n->next) {

+ for (nch = n->child; nch != NULL; nch = nch->next) {

t = print_otag(h, TAG_B, 1, &tag);

- print_text(h, n->string);

+ print_text(h, nch->string);

print_tagq(h, t);

h->flags |= HTML_NOSPACE;

print_text(h, "()");

- if (n->next == NULL)

+ if (nch->next == NULL)

continue;

- if (nchild > 2) {

+ if (nch->prev != NULL || nch->next->next != NULL) {

h->flags |= HTML_NOSPACE;

print_text(h, ",");

}

- if (n->next->next == NULL)

+ if (nch->next->next == NULL)

print_text(h, "and");

}

- if (nchild > 1)

+ if (n->child != NULL && n->child->next != NULL)

print_text(h, "functions return");

else

print_text(h, "function returns");

@@ -1999,7 +2000,7 @@ mdoc_bk_pre(MDOC_ARGS)

case ROFFT_HEAD:

return 0;

case ROFFT_BODY:

- if (n->parent->args || 0 == n->prev->nchild)

+ if (n->parent->args != NULL || n->prev->child == NULL)

h->flags |= HTML_PREKEEP;

break;

default:

@@ -2028,7 +2029,7 @@ mdoc_quote_pre(MDOC_ARGS)

switch (n->tok) {

case MDOC_Ao:

case MDOC_Aq:

- print_text(h, n->nchild == 1 &&

+ print_text(h, n->child != NULL && n->child->next == NULL &&

n->child->tok == MDOC_Mt ? "<" : "\\(la");

break;

case MDOC_Bro:

@@ -2092,7 +2093,7 @@ mdoc_quote_post(MDOC_ARGS)

switch (n->tok) {

case MDOC_Ao:

case MDOC_Aq:

- print_text(h, n->nchild == 1 &&

+ print_text(h, n->child != NULL && n->child->next == NULL &&

n->child->tok == MDOC_Mt ? ">" : "\\(ra");

break;

case MDOC_Bro:

diff --git a/usr.bin/mandoc/mdoc_man.c b/usr.bin/mandoc/mdoc_man.c
index d1731008453..f560ecb9522 100644
--- a/usr.bin/mandoc/mdoc_man.c
+++ b/usr.bin/mandoc/mdoc_man.c

@@ -1,6 +1,6 @@

-/* $OpenBSD: mdoc_man.c,v 1.93 2015/10/12 00:07:27 schwarze Exp $ */

+/* $OpenBSD: mdoc_man.c,v 1.94 2016/01/08 17:48:04 schwarze Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

@@ -608,7 +608,8 @@ print_node(DECL_ARGS)

act = manacts + n->tok;

cond = act->cond == NULL || (*act->cond)(meta, n);

- if (cond && act->pre && (n->end == ENDBODY_NOT || n->nchild))

+ if (cond && act->pre != NULL &&

+ (n->end == ENDBODY_NOT || n->child != NULL))

do_sub = (*act->pre)(meta, n);

}

@@ -679,30 +680,29 @@ post_enc(DECL_ARGS)

static int

pre_ex(DECL_ARGS)

{

- int nchild;

+ struct roff_node *nch;

outflags |= MMAN_br | MMAN_nl;

print_word("The");

- nchild = n->nchild;

- for (n = n->child; n; n = n->next) {

+ for (nch = n->child; nch != NULL; nch = nch->next) {

font_push('B');

- print_word(n->string);

+ print_word(nch->string);

font_pop();

- if (n->next == NULL)

+ if (nch->next == NULL)

continue;

- if (nchild > 2) {

+ if (nch->prev != NULL || nch->next->next != NULL) {

outflags &= ~MMAN_spc;

print_word(",");

}

- if (n->next->next == NULL)

+ if (nch->next->next == NULL)

print_word("and");

}

- if (nchild > 1)

+ if (n->child != NULL && n->child->next != NULL)

print_word("utilities exit\\~0");

else

print_word("utility exits\\~0");

@@ -871,7 +871,7 @@ static int

pre_aq(DECL_ARGS)

{

- print_word(n->nchild == 1 &&

+ print_word(n->child != NULL && n->child->next == NULL &&

n->child->tok == MDOC_Mt ? "<" : "\\(la");

outflags &= ~MMAN_spc;

return 1;

@@ -882,7 +882,7 @@ post_aq(DECL_ARGS)

{

outflags &= ~(MMAN_spc | MMAN_nl);

- print_word(n->nchild == 1 &&

+ print_word(n->child != NULL && n->child->next == NULL &&

n->child->tok == MDOC_Mt ? ">" : "\\(ra");

}

@@ -998,7 +998,7 @@ pre_bl(DECL_ARGS)

return 1;

}

- if (n->nchild) {

+ if (n->child != NULL) {

print_line(".TS", MMAN_nl);

for (icol = 0; icol < n->norm->Bl.ncols; icol++)

print_word("l");

@@ -1014,7 +1014,7 @@ post_bl(DECL_ARGS)

switch (n->norm->Bl.type) {

case LIST_column:

- if (n->nchild)

+ if (n->child != NULL)

print_line(".TE", 0);

break;

case LIST_enum:

@@ -1212,7 +1212,7 @@ pre_fl(DECL_ARGS)

font_push('B');

print_word("\\-");

- if (n->nchild)

+ if (n->child != NULL)

outflags &= ~MMAN_spc;

return 1;

}

@@ -1222,7 +1222,7 @@ post_fl(DECL_ARGS)

{

font_pop();

- if ( ! (n->nchild ||

+ if (!(n->child != NULL ||

n->next == NULL ||

n->next->type == ROFFT_TEXT ||

n->next->flags & MDOC_LINE))

@@ -1643,34 +1643,33 @@ pre_rs(DECL_ARGS)

static int

pre_rv(DECL_ARGS)

{

- int nchild;

+ struct roff_node *nch;

outflags |= MMAN_br | MMAN_nl;

- nchild = n->nchild;

- if (nchild > 0) {

+ if (n->child != NULL) {

print_word("The");

- for (n = n->child; n; n = n->next) {

+ for (nch = n->child; nch != NULL; nch = nch->next) {

font_push('B');

- print_word(n->string);

+ print_word(nch->string);

font_pop();

outflags &= ~MMAN_spc;

print_word("()");

- if (n->next == NULL)

+ if (nch->next == NULL)

continue;

- if (nchild > 2) {

+ if (nch->prev != NULL || nch->next->next != NULL) {

outflags &= ~MMAN_spc;

print_word(",");

}

- if (n->next->next == NULL)

+ if (nch->next->next == NULL)

print_word("and");

}

- if (nchild > 1)

+ if (n->child != NULL && n->child->next != NULL)

print_word("functions return");

else

print_word("function returns");

diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index c5547f7cc15..93d3dbc3361 100644
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c

@@ -1,7 +1,7 @@

-/* $OpenBSD: mdoc_term.c,v 1.229 2015/10/12 15:27:53 schwarze Exp $ */

+/* $OpenBSD: mdoc_term.c,v 1.230 2016/01/08 17:48:04 schwarze Exp $ */

* Permission to use, copy, modify, and distribute this software for any

@@ -355,7 +355,7 @@ print_mdoc_node(DECL_ARGS)

break;

default:

if (termacts[n->tok].pre &&

- (n->end == ENDBODY_NOT || n->nchild))

+ (n->end == ENDBODY_NOT || n->child != NULL))

chld = (*termacts[n->tok].pre)

(p, &npair, meta, n);

break;

@@ -596,7 +596,7 @@ static int

termp_ll_pre(DECL_ARGS)

{

- term_setwidth(p, n->nchild ? n->child->string : NULL);

+ term_setwidth(p, n->child != NULL ? n->child->string : NULL);

return 0;

}

@@ -729,7 +729,7 @@ termp_it_pre(DECL_ARGS)

term_word(p, "\\ \\ ");

break;

case LIST_inset:

- if (n->type == ROFFT_BODY && n->parent->head->nchild)

+ if (n->type == ROFFT_BODY && n->parent->head->child != NULL)

term_word(p, "\\ ");

break;

default:

@@ -1037,7 +1037,7 @@ termp_fl_pre(DECL_ARGS)

term_fontpush(p, TERMFONT_BOLD);

term_word(p, "\\-");

- if ( ! (n->nchild == 0 &&

+ if (!(n->child == NULL &&

(n->next == NULL ||

n->next->type == ROFFT_TEXT ||

n->next->flags & MDOC_LINE)))

@@ -1104,34 +1104,33 @@ termp_rs_pre(DECL_ARGS)

static int

termp_rv_pre(DECL_ARGS)

{

- int nchild;

+ struct roff_node *nch;

term_newln(p);

- nchild = n->nchild;

- if (nchild > 0) {

+ if (n->child != NULL) {

term_word(p, "The");

- for (n = n->child; n; n = n->next) {

+ for (nch = n->child; nch != NULL; nch = nch->next) {

term_fontpush(p, TERMFONT_BOLD);

- term_word(p, n->string);

+ term_word(p, nch->string);

term_fontpop(p);

p->flags |= TERMP_NOSPACE;

term_word(p, "()");

- if (n->next == NULL)

+ if (nch->next == NULL)

continue;

- if (nchild > 2) {

+ if (nch->prev != NULL || nch->next->next != NULL) {

p->flags |= TERMP_NOSPACE;

term_word(p, ",");

}

- if (n->next->next == NULL)

+ if (nch->next->next == NULL)

term_word(p, "and");

}

- if (nchild > 1)

+ if (n->child != NULL && n->child->next != NULL)

term_word(p, "functions return");

else

term_word(p, "function returns");

@@ -1157,27 +1156,29 @@ termp_rv_pre(DECL_ARGS)

static int

termp_ex_pre(DECL_ARGS)

{

- int nchild;

+ struct roff_node *nch;

term_newln(p);

term_word(p, "The");

- nchild = n->nchild;

- for (n = n->child; n; n = n->next) {

+ for (nch = n->child; nch != NULL; nch = nch->next) {

term_fontpush(p, TERMFONT_BOLD);

- term_word(p, n->string);

+ term_word(p, nch->string);

term_fontpop(p);

- if (nchild > 2 && n->next) {

+ if (nch->next == NULL)

+ continue;

+ if (nch->prev != NULL || nch->next->next != NULL) {

p->flags |= TERMP_NOSPACE;

term_word(p, ",");

}

- if (n->next && NULL == n->next->next)

+ if (nch->next->next == NULL)

term_word(p, "and");

}

- if (nchild > 1)

+ if (n->child != NULL && n->child->next != NULL)

term_word(p, "utilities exit\\~0");

else

term_word(p, "utility exits\\~0");

@@ -1836,7 +1837,7 @@ termp_quote_pre(DECL_ARGS)

switch (n->tok) {

case MDOC_Ao:

case MDOC_Aq:

- term_word(p, n->nchild == 1 &&

+ term_word(p, n->child != NULL && n->child->next == NULL &&

n->child->tok == MDOC_Mt ? "<" : "\\(la");

break;

case MDOC_Bro:

@@ -1893,7 +1894,7 @@ termp_quote_post(DECL_ARGS)

switch (n->tok) {

case MDOC_Ao:

case MDOC_Aq:

- term_word(p, n->nchild == 1 &&

+ term_word(p, n->child != NULL && n->child->next == NULL &&

n->child->tok == MDOC_Mt ? ">" : "\\(ra");

break;

case MDOC_Bro:

@@ -2157,7 +2158,7 @@ termp_bk_pre(DECL_ARGS)

case ROFFT_HEAD:

return 0;

case ROFFT_BODY:

- if (n->parent->args || 0 == n->prev->nchild)

+ if (n->parent->args != NULL || n->prev->child == NULL)

p->flags |= TERMP_PREKEEP;

break;

default:

diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 5c65594b432..3cb63437c76 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c

@@ -1,7 +1,7 @@

-/* $OpenBSD: mdoc_validate.c,v 1.216 2015/10/30 19:03:36 schwarze Exp $ */

+/* $OpenBSD: mdoc_validate.c,v 1.217 2016/01/08 17:48:04 schwarze Exp $ */

* Permission to use, copy, modify, and distribute this software for any

@@ -1269,7 +1269,8 @@ post_bl_head(POST_ARGS)

argv = nbl->args->argv + j;

i = argv->sz;

- argv->sz += nh->nchild;

+ for (nch = nh->child; nch != NULL; nch = nch->next)

+ argv->sz++;

argv->value = mandoc_reallocarray(argv->value,

argv->sz, sizeof(char *));

@@ -1282,7 +1283,6 @@ post_bl_head(POST_ARGS)

nnext = nch->next;

roff_node_delete(NULL, nch);

}

- nh->nchild = 0;

nh->child = NULL;

}

@@ -1343,14 +1343,11 @@ post_bl(POST_ARGS)

assert(nchild->prev == NULL);

- if (--nbody->nchild == 0) {

- nbody->child = NULL;

+ nbody->child = nnext;

+ if (nnext == NULL)

nbody->last = NULL;

- assert(nnext == NULL);

- } else {

- nbody->child = nnext;

+ else

nnext->prev = NULL;

- }

* Relink this child.

@@ -1361,7 +1358,6 @@ post_bl(POST_ARGS)

nchild->next = nblock;

nblock->prev = nchild;

- nparent->nchild++;

if (nprev == NULL)

nparent->child = nchild;

else

@@ -1679,7 +1675,9 @@ post_sh_see_also(POST_ARGS)

n = mdoc->last->child;

lastname = lastsec = lastpunct = NULL;

while (n != NULL) {

- if (n->tok != MDOC_Xr || n->nchild < 2)

+ if (n->tok != MDOC_Xr ||

+ n->child == NULL ||

+ n->child->next == NULL)

break;

/* Process one .Xr node. */

@@ -1735,7 +1733,7 @@ child_an(const struct roff_node *n)

{

for (n = n->child; n != NULL; n = n->next)

- if ((n->tok == MDOC_An && n->nchild) || child_an(n))

+ if ((n->tok == MDOC_An && n->child != NULL) || child_an(n))

return 1;

return 0;

}

@@ -1922,7 +1920,7 @@ post_par(POST_ARGS)

post_prevpar(mdoc);

if (np->tok == MDOC_sp) {

- if (np->nchild > 1)

+ if (np->child != NULL && np->child->next != NULL)

mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,

np->child->next->line, np->child->next->pos,

"sp ... %s", np->child->next->string);

diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index 674b17cfa7e..2474f9a0f3d 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: roff.c,v 1.155 2015/10/22 21:53:49 schwarze Exp $ */

+/* $OpenBSD: roff.c,v 1.156 2016/01/08 17:48:04 schwarze Exp $ */

@@ -1022,7 +1022,6 @@ roff_node_append(struct roff_man *man, struct roff_node *n)

default:

abort();

}

- n->parent->nchild++;

man->last = n;

switch (n->type) {

@@ -1167,7 +1166,6 @@ roff_node_unlink(struct roff_man *man, struct roff_node *n)

/* Adjust parent. */

if (n->parent != NULL) {

- n->parent->nchild--;

if (n->parent->child == n)

n->parent->child = n->next;

if (n->parent->last == n)

@@ -1209,7 +1207,6 @@ roff_node_delete(struct roff_man *man, struct roff_node *n)

while (n->child != NULL)

roff_node_delete(man, n->child);

- assert(n->nchild == 0);

roff_node_unlink(man, n);

roff_node_free(n);

}

diff --git a/usr.bin/mandoc/roff.h b/usr.bin/mandoc/roff.h
index 3e7bc033374..edcab9add8f 100644
--- a/usr.bin/mandoc/roff.h
+++ b/usr.bin/mandoc/roff.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: roff.h,v 1.18 2015/11/07 13:57:55 schwarze Exp $ */

+/* $OpenBSD: roff.h,v 1.19 2016/01/08 17:48:04 schwarze Exp $ */

@@ -93,7 +93,6 @@ struct roff_node {

char *string; /* TEXT */

const struct tbl_span *span; /* TBL */

const struct eqn *eqn; /* EQN */

- int nchild; /* Number of child nodes. */

int line; /* Input file line number. */

int pos; /* Input file column number. */

int tok; /* Request or macro ID. */