===================================================================
RCS file: /cvs/mandoc/Attic/man_hash.c,v
retrieving revision 1.26
retrieving revision 1.36
diff -u -p -r1.26 -r1.36
--- mandoc/Attic/man_hash.c	2014/03/23 11:25:26	1.26
+++ mandoc/Attic/man_hash.c	2017/04/24 23:06:18	1.36
@@ -1,6 +1,7 @@
-/*	$Id: man_hash.c,v 1.26 2014/03/23 11:25:26 schwarze Exp $ */
+/*	$Id: man_hash.c,v 1.36 2017/04/24 23:06:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -25,8 +24,10 @@
 #include <limits.h>
 #include <string.h>
 
-#include "man.h"
 #include "mandoc.h"
+#include "roff.h"
+#include "man.h"
+#include "libmandoc.h"
 #include "libman.h"
 
 #define	HASH_DEPTH	 6
@@ -48,23 +49,20 @@
  */
 static	unsigned char	 table[26 * HASH_DEPTH];
 
-/*
- * XXX - this hash has global scope, so if intended for use as a library
- * with multiple callers, it will need re-invocation protection.
- */
+
 void
 man_hash_init(void)
 {
 	int		 i, j, x;
 
+	if (*table != '\0')
+		return;
+
 	memset(table, UCHAR_MAX, sizeof(table));
 
-	assert(/* LINTED */ 
-			MAN_MAX < UCHAR_MAX);
+	for (i = 0; i < (int)(MAN_MAX - MAN_TH); i++) {
+		x = *roff_name[MAN_TH + i];
 
-	for (i = 0; i < (int)MAN_MAX; i++) {
-		x = man_macronames[i][0];
-
 		assert(isalpha((unsigned char)x));
 
 		HASH_ROW(x);
@@ -79,28 +77,25 @@ man_hash_init(void)
 	}
 }
 
-
-enum mant
+enum roff_tok
 man_hash_find(const char *tmp)
 {
 	int		 x, y, i;
-	enum mant	 tok;
 
 	if ('\0' == (x = tmp[0]))
-		return(MAN_MAX);
+		return TOKEN_NONE;
 	if ( ! (isalpha((unsigned char)x)))
-		return(MAN_MAX);
+		return TOKEN_NONE;
 
 	HASH_ROW(x);
 
 	for (i = 0; i < HASH_DEPTH; i++) {
 		if (UCHAR_MAX == (y = table[x + i]))
-			return(MAN_MAX);
+			return TOKEN_NONE;
 
-		tok = (enum mant)y;
-		if (0 == strcmp(tmp, man_macronames[tok]))
-			return(tok);
+		if (strcmp(tmp, roff_name[MAN_TH + y]) == 0)
+			return MAN_TH + y;
 	}
 
-	return(MAN_MAX);
+	return TOKEN_NONE;
 }