===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.193
retrieving revision 1.196
diff -u -p -r1.193 -r1.196
--- mandoc/mandocdb.c	2015/04/18 17:53:21	1.193
+++ mandoc/mandocdb.c	2015/09/16 09:50:29	1.196
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.193 2015/04/18 17:53:21 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.196 2015/09/16 09:50:29 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1246,10 +1246,6 @@ mpages_merge(struct mparse *mp)
 		mlink = mpage->mlinks;
 
 nextpage:
-		if (mparse_wait(mp) != MANDOCLEVEL_OK) {
-			exitcode = (int)MANDOCLEVEL_SYSERR;
-			say(mlink->file, "&wait gunzip");
-		}
 		ohash_delete(&strings);
 		ohash_delete(&names);
 		mpage = ohash_next(&mpages, &pslot);
@@ -1476,7 +1472,7 @@ parse_man(struct mpage *mpage, const struct roff_meta 
 			 */
 
 			title = NULL;
-			man_deroff(&title, body);
+			deroff(&title, body);
 			if (NULL == title)
 				return;
 
@@ -1720,7 +1716,7 @@ parse_mdoc_Nd(struct mpage *mpage, const struct roff_m
 {
 
 	if (n->type == ROFFT_BODY)
-		mdoc_deroff(&mpage->desc, n);
+		deroff(&mpage->desc, n);
 	return(0);
 }
 
@@ -2212,7 +2208,7 @@ dbclose(int real)
 		return;
 	case 0:
 		execlp("cmp", "cmp", "-s",
-		    tempfilename, MANDOC_DB, NULL);
+		    tempfilename, MANDOC_DB, (char *)NULL);
 		say("", "&exec cmp");
 		exit(0);
 	default:
@@ -2237,7 +2233,7 @@ dbclose(int real)
 		say("", "&fork rm");
 		return;
 	case 0:
-		execlp("rm", "rm", "-rf", tempfilename, NULL);
+		execlp("rm", "rm", "-rf", tempfilename, (char *)NULL);
 		say("", "&exec rm");
 		exit((int)MANDOCLEVEL_SYSERR);
 	default: