===================================================================
RCS file: /cvs/mandoc/Attic/man_hash.c,v
retrieving revision 1.31
retrieving revision 1.34
diff -u -p -r1.31 -r1.34
--- mandoc/Attic/man_hash.c	2015/04/02 22:48:17	1.31
+++ mandoc/Attic/man_hash.c	2015/10/06 18:32:19	1.34
@@ -1,6 +1,7 @@
-/*	$Id: man_hash.c,v 1.31 2015/04/02 22:48:17 schwarze Exp $ */
+/*	$Id: man_hash.c,v 1.34 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015 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
@@ -47,19 +48,16 @@
 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(MAN_MAX < UCHAR_MAX);
-
 	for (i = 0; i < (int)MAN_MAX; i++) {
 		x = man_macronames[i][0];
 
@@ -84,20 +82,20 @@ man_hash_find(const char *tmp)
 	int		 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 = y;
 		if (0 == strcmp(tmp, man_macronames[tok]))
-			return(tok);
+			return tok;
 	}
 
-	return(MAN_MAX);
+	return TOKEN_NONE;
 }