===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_hash.c,v
retrieving revision 1.19
retrieving revision 1.28
diff -u -p -r1.19 -r1.28
--- mandoc/Attic/mdoc_hash.c	2014/03/23 11:25:26	1.19
+++ mandoc/Attic/mdoc_hash.c	2017/04/24 23:06:18	1.28
@@ -1,6 +1,7 @@
-/*	$Id: mdoc_hash.c,v 1.19 2014/03/23 11:25:26 schwarze Exp $ */
+/*	$Id: mdoc_hash.c,v 1.28 2017/04/24 23:06:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 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>
 
@@ -27,25 +26,28 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "roff.h"
 #include "mdoc.h"
+#include "libmandoc.h"
 #include "libmdoc.h"
 
 static	unsigned char	 table[27 * 12];
 
-/*
- * XXX - this hash has global scope, so if intended for use as a library
- * with multiple callers, it will need re-invocation protection.
- */
+
 void
 mdoc_hash_init(void)
 {
 	int		 i, j, major;
 	const char	*p;
 
+	if (*table != '\0')
+		return;
+
 	memset(table, UCHAR_MAX, sizeof(table));
 
-	for (i = 0; i < (int)MDOC_MAX; i++) {
-		p = mdoc_macronames[i];
+	for (i = 0; i < (int)(MDOC_MAX - MDOC_Dd); i++) {
+		p = roff_name[MDOC_Dd + i];
 
 		if (isalpha((unsigned char)p[1]))
 			major = 12 * (tolower((unsigned char)p[1]) - 97);
@@ -62,32 +64,32 @@ mdoc_hash_init(void)
 	}
 }
 
-enum mdoct
+enum roff_tok
 mdoc_hash_find(const char *p)
 {
 	int		  major, i, j;
 
 	if (0 == p[0])
-		return(MDOC_MAX);
+		return TOKEN_NONE;
 	if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
-		return(MDOC_MAX);
+		return TOKEN_NONE;
 
 	if (isalpha((unsigned char)p[1]))
 		major = 12 * (tolower((unsigned char)p[1]) - 97);
 	else if ('1' == p[1])
 		major = 12 * 26;
-	else 
-		return(MDOC_MAX);
+	else
+		return TOKEN_NONE;
 
 	if (p[2] && p[3])
-		return(MDOC_MAX);
+		return TOKEN_NONE;
 
 	for (j = 0; j < 12; j++) {
 		if (UCHAR_MAX == (i = table[major + j]))
 			break;
-		if (0 == strcmp(p, mdoc_macronames[i]))
-			return((enum mdoct)i);
+		if (strcmp(p, roff_name[MDOC_Dd + i]) == 0)
+			return MDOC_Dd + i;
 	}
 
-	return(MDOC_MAX);
+	return TOKEN_NONE;
 }