===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.214
retrieving revision 1.217
diff -u -p -r1.214 -r1.217
--- mandoc/mandocdb.c	2016/01/08 15:02:54	1.214
+++ mandoc/mandocdb.c	2016/07/09 15:24:19	1.217
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.214 2016/01/08 15:02:54 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.217 2016/07/09 15:24:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,7 +33,6 @@
 #else
 #include "compat_fts.h"
 #endif
-#include <getopt.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -574,7 +573,7 @@ usage:
  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *
- * TODO: accomodate for multi-language directories.
+ * TODO: accommodate for multi-language directories.
  */
 static int
 treescan(void)
@@ -1446,7 +1445,7 @@ parse_man(struct mpage *mpage, const struct roff_meta 
 	char		 byte;
 	size_t		 sz;
 
-	if (NULL == n)
+	if (n == NULL)
 		return;
 
 	/*
@@ -1458,13 +1457,12 @@ parse_man(struct mpage *mpage, const struct roff_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.
@@ -1697,7 +1695,9 @@ parse_mdoc_Va(struct mpage *mpage, const struct roff_m
 	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;