===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- src/usr.bin/mandoc/mandocdb.c	2015/10/13 15:50:15	1.156
+++ src/usr.bin/mandoc/mandocdb.c	2015/10/13 22:57:49	1.157
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mandocdb.c,v 1.156 2015/10/13 15:50:15 schwarze Exp $ */
+/*	$OpenBSD: mandocdb.c,v 1.157 2015/10/13 22:57:49 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -189,7 +189,6 @@
 static	int		 exitcode; /* to be returned by main */
 static	enum op		 op; /* operational mode */
 static	char		 basedir[PATH_MAX]; /* current base directory */
-static	struct mchars	*mchars; /* table of named characters */
 static	struct ohash	 mpages; /* table of distinct manual pages */
 static	struct ohash	 mlinks; /* table of directory entries */
 static	struct ohash	 names; /* table of all names */
@@ -423,9 +422,8 @@
 	}
 
 	exitcode = (int)MANDOCLEVEL_OK;
-	mchars = mchars_alloc();
-	mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL,
-	    mchars, NULL);
+	mchars_alloc();
+	mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL, NULL);
 	mandoc_ohash_init(&mpages, 6, offsetof(struct mpage, inodev));
 	mandoc_ohash_init(&mlinks, 6, offsetof(struct mlink, file));
 
@@ -532,7 +530,7 @@
 out:
 	manconf_free(&conf);
 	mparse_free(mp);
-	mchars_free(mchars);
+	mchars_free();
 	mpages_free();
 	ohash_delete(&mpages);
 	ohash_delete(&mlinks);
@@ -1930,7 +1928,7 @@
 		 */
 
 		if (write_utf8) {
-			unicode = mchars_spec2cp(mchars, seq, seqlen);
+			unicode = mchars_spec2cp(seq, seqlen);
 			if (unicode <= 0)
 				continue;
 			addsz = utf8(unicode, utfbuf);
@@ -1938,7 +1936,7 @@
 				continue;
 			addcp = utfbuf;
 		} else {
-			addcp = mchars_spec2str(mchars, seq, seqlen, &addsz);
+			addcp = mchars_spec2str(seq, seqlen, &addsz);
 			if (addcp == NULL)
 				continue;
 			if (*addcp == ASCII_NBRSP) {