===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.193
retrieving revision 1.197
diff -u -p -r1.193 -r1.197
--- mandoc/mandocdb.c	2015/04/18 17:53:21	1.193
+++ mandoc/mandocdb.c	2015/10/06 18:32:19	1.197
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.193 2015/04/18 17:53:21 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.197 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -547,7 +547,7 @@ out:
 	mpages_free();
 	ohash_delete(&mpages);
 	ohash_delete(&mlinks);
-	return(exitcode);
+	return exitcode;
 usage:
 	fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n"
 			"       %s [-aDnpQ] [-Tutf8] dir ...\n"
@@ -557,7 +557,7 @@ usage:
 		       progname, progname, progname,
 		       progname, progname);
 
-	return((int)MANDOCLEVEL_BADARG);
+	return (int)MANDOCLEVEL_BADARG;
 }
 
 /*
@@ -594,7 +594,7 @@ treescan(void)
 	if (NULL == f) {
 		exitcode = (int)MANDOCLEVEL_SYSERR;
 		say("", "&fts_open");
-		return(0);
+		return 0;
 	}
 
 	dsec = arch = NULL;
@@ -763,7 +763,7 @@ treescan(void)
 	}
 
 	fts_close(f);
-	return(1);
+	return 1;
 }
 
 /*
@@ -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;
 
@@ -1608,7 +1604,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct roff_m
 	if (SEC_SYNOPSIS != n->sec ||
 	    NULL == (n = n->child) ||
 	    n->type != ROFFT_TEXT)
-		return(0);
+		return 0;
 
 	/*
 	 * Only consider those `Fd' macro fields that begin with an
@@ -1616,10 +1612,10 @@ parse_mdoc_Fd(struct mpage *mpage, const struct roff_m
 	 */
 
 	if (strcmp("#include", n->string))
-		return(0);
+		return 0;
 
 	if ((n = n->next) == NULL || n->type != ROFFT_TEXT)
-		return(0);
+		return 0;
 
 	/*
 	 * Strip away the enclosing angle brackets and make sure we're
@@ -1631,7 +1627,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct roff_m
 		start++;
 
 	if (0 == (sz = strlen(start)))
-		return(0);
+		return 0;
 
 	end = &start[(int)sz - 1];
 	if ('>' == *end || '"' == *end)
@@ -1639,7 +1635,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct roff_m
 
 	if (end > start)
 		putkeys(mpage, start, end - start + 1, TYPE_In);
-	return(0);
+	return 0;
 }
 
 static void
@@ -1669,7 +1665,7 @@ parse_mdoc_Fn(struct mpage *mpage, const struct roff_m
 {
 
 	if (n->child == NULL)
-		return(0);
+		return 0;
 
 	parse_mdoc_fname(mpage, n->child);
 
@@ -1677,7 +1673,7 @@ parse_mdoc_Fn(struct mpage *mpage, const struct roff_m
 		if (n->type == ROFFT_TEXT)
 			putkey(mpage, n->string, TYPE_Fa);
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1686,12 +1682,12 @@ parse_mdoc_Fo(struct mpage *mpage, const struct roff_m
 {
 
 	if (n->type != ROFFT_HEAD)
-		return(1);
+		return 1;
 
 	if (n->child != NULL)
 		parse_mdoc_fname(mpage, n->child);
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1701,17 +1697,17 @@ parse_mdoc_Xr(struct mpage *mpage, const struct roff_m
 	char	*cp;
 
 	if (NULL == (n = n->child))
-		return(0);
+		return 0;
 
 	if (NULL == n->next) {
 		putkey(mpage, n->string, TYPE_Xr);
-		return(0);
+		return 0;
 	}
 
 	mandoc_asprintf(&cp, "%s(%s)", n->string, n->next->string);
 	putkey(mpage, cp, TYPE_Xr);
 	free(cp);
-	return(0);
+	return 0;
 }
 
 static int
@@ -1720,8 +1716,8 @@ parse_mdoc_Nd(struct mpage *mpage, const struct roff_m
 {
 
 	if (n->type == ROFFT_BODY)
-		mdoc_deroff(&mpage->desc, n);
-	return(0);
+		deroff(&mpage->desc, n);
+	return 0;
 }
 
 static int
@@ -1743,7 +1739,7 @@ parse_mdoc_Nm(struct mpage *mpage, const struct roff_m
 		putkey(mpage, n->child->string, ROFFT_HEAD);
 		mpage->name_head_done = 1;
 	}
-	return(0);
+	return 0;
 }
 
 static int
@@ -1751,7 +1747,7 @@ parse_mdoc_Sh(struct mpage *mpage, const struct roff_m
 	const struct roff_node *n)
 {
 
-	return(n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD);
+	return n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD;
 }
 
 static int
@@ -1759,7 +1755,7 @@ parse_mdoc_head(struct mpage *mpage, const struct roff
 	const struct roff_node *n)
 {
 
-	return(n->type == ROFFT_HEAD);
+	return n->type == ROFFT_HEAD;
 }
 
 static int
@@ -1767,7 +1763,7 @@ parse_mdoc_body(struct mpage *mpage, const struct roff
 	const struct roff_node *n)
 {
 
-	return(n->type == ROFFT_BODY);
+	return n->type == ROFFT_BODY;
 }
 
 /*
@@ -1872,10 +1868,10 @@ utf8(unsigned int cp, char out[7])
 		out[4] = (cp >> 6  & 63) | 128;
 		out[5] = (cp       & 63) | 128;
 	} else
-		return(0);
+		return 0;
 
 	out[rc] = '\0';
-	return(rc);
+	return rc;
 }
 
 /*
@@ -1999,9 +1995,9 @@ render_string(char **public, size_t *psz)
 		--*psz;
 	if (dst != NULL) {
 		(*public)[*psz] = '\0';
-		return(1);
+		return 1;
 	} else
-		return(0);
+		return 0;
 }
 
 static void
@@ -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:
@@ -2268,7 +2264,7 @@ dbopen(int real)
 	int		 rc, ofl;
 
 	if (nodb)
-		return(1);
+		return 1;
 
 	*tempfilename = '\0';
 	ofl = SQLITE_OPEN_READWRITE;
@@ -2279,7 +2275,7 @@ dbopen(int real)
 			exitcode = (int)MANDOCLEVEL_SYSERR;
 			if (SQLITE_CANTOPEN != rc)
 				say(MANDOC_DB, "%s", sqlite3_errstr(rc));
-			return(0);
+			return 0;
 		}
 		goto prepare_statements;
 	}
@@ -2293,7 +2289,7 @@ dbopen(int real)
 	if (MPARSE_QUICK & mparse_options) {
 		exitcode = (int)MANDOCLEVEL_SYSERR;
 		say(MANDOC_DB "~", "%s", sqlite3_errstr(rc));
-		return(0);
+		return 0;
 	}
 
 	(void)strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX",
@@ -2301,7 +2297,7 @@ dbopen(int real)
 	if (NULL == mkdtemp(tempfilename)) {
 		exitcode = (int)MANDOCLEVEL_SYSERR;
 		say("", "&%s", tempfilename);
-		return(0);
+		return 0;
 	}
 	(void)strlcat(tempfilename, "/" MANDOC_DB,
 	    sizeof(tempfilename));
@@ -2309,7 +2305,7 @@ dbopen(int real)
 	if (SQLITE_OK != rc) {
 		exitcode = (int)MANDOCLEVEL_SYSERR;
 		say("", "%s: %s", tempfilename, sqlite3_errstr(rc));
-		return(0);
+		return 0;
 	}
 
 create_tables:
@@ -2348,7 +2344,7 @@ create_tables:
 		exitcode = (int)MANDOCLEVEL_SYSERR;
 		say(MANDOC_DB, "%s", sqlite3_errmsg(db));
 		sqlite3_close(db);
-		return(0);
+		return 0;
 	}
 
 prepare_statements:
@@ -2358,7 +2354,7 @@ prepare_statements:
 		say(MANDOC_DB, "PRAGMA foreign_keys: %s",
 		    sqlite3_errmsg(db));
 		sqlite3_close(db);
-		return(0);
+		return 0;
 	}
 
 	sql = "DELETE FROM mpages WHERE pageid IN "
@@ -2392,25 +2388,25 @@ prepare_statements:
 		say(MANDOC_DB, "PRAGMA synchronous: %s",
 		    sqlite3_errmsg(db));
 		sqlite3_close(db);
-		return(0);
+		return 0;
 	}
 #endif
 
-	return(1);
+	return 1;
 }
 
 static void *
 hash_calloc(size_t n, size_t sz, void *arg)
 {
 
-	return(mandoc_calloc(n, sz));
+	return mandoc_calloc(n, sz);
 }
 
 static void *
 hash_alloc(size_t sz, void *arg)
 {
 
-	return(mandoc_malloc(sz));
+	return mandoc_malloc(sz);
 }
 
 static void
@@ -2459,12 +2455,12 @@ set_basedir(const char *targetdir, int report_baddir)
 		if (2 == getcwd_status) {
 			exitcode = (int)MANDOCLEVEL_SYSERR;
 			say("", "getcwd: %s", startdir);
-			return(0);
+			return 0;
 		}
 		if (-1 == chdir(startdir)) {
 			exitcode = (int)MANDOCLEVEL_SYSERR;
 			say("", "&chdir %s", startdir);
-			return(0);
+			return 0;
 		}
 	}
 
@@ -2478,13 +2474,13 @@ set_basedir(const char *targetdir, int report_baddir)
 			exitcode = (int)MANDOCLEVEL_BADARG;
 			say("", "&%s: realpath", targetdir);
 		}
-		return(0);
+		return 0;
 	} else if (-1 == chdir(basedir)) {
 		if (report_baddir || errno != ENOENT) {
 			exitcode = (int)MANDOCLEVEL_BADARG;
 			say("", "&chdir");
 		}
-		return(0);
+		return 0;
 	}
 	chdir_status = 1;
 	cp = strchr(basedir, '\0');
@@ -2492,12 +2488,12 @@ set_basedir(const char *targetdir, int report_baddir)
 		if (cp - basedir >= PATH_MAX - 1) {
 			exitcode = (int)MANDOCLEVEL_SYSERR;
 			say("", "Filename too long");
-			return(0);
+			return 0;
 		}
 		*cp++ = '/';
 		*cp = '\0';
 	}
-	return(1);
+	return 1;
 }
 
 static void