sync to 1.9.5: lookup hashes are now static tables

shortening the code, and, according to kristaps@, speeding it up

1 files changed, 13 insertions, 33 deletions

diff --git a/usr.bin/mandoc/man_hash.c b/usr.bin/mandoc/man_hash.c
index 2b83f0f56b3..b7d376fa2bf 100644
--- a/usr.bin/mandoc/man_hash.c
+++ b/usr.bin/mandoc/man_hash.c
@@ -1,4 +1,4 @@
-/*	$Id: man_hash.c,v 1.5 2009/08/22 23:17:40 schwarze Exp $ */
+/*	$Id: man_hash.c,v 1.6 2009/09/21 21:11:37 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,39 +15,27 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"
 
+static	u_char		table[26 * 6];
 
-/* ARGUSED */
+/*
+ * 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_free(void *htab)
-{
-
-	free(htab);
-}
-
-
-/* ARGUSED */
-void *
-man_hash_alloc(void)
+man_hash_init(void)
 {
-	int		*htab;
 	int		 i, j, x;
 
-	/* Initialised to -1. */
-
-	htab = malloc(26 * 6 * sizeof(int));
-	if (NULL == htab)
-		return(NULL);
-	for (i = 0; i < 26 * 6; i++)
-		htab[i] = -1;
+	memset(table, UCHAR_MAX, sizeof(table));
 
 	for (i = 0; i < MAN_MAX; i++) {
 		x = man_macronames[i][0];
-
 		assert((x >= 65 && x <= 90) ||
 				(x >= 97 && x <= 122));
 
@@ -55,25 +43,18 @@ man_hash_alloc(void)
 		x *= 6;
 
 		for (j = 0; j < 6; j++)
-			if (-1 == htab[x + j]) {
-				htab[x + j] = i;
+			if (UCHAR_MAX == table[x + j]) {
+				table[x + j] = (u_char)i;
 				break;
 			}
-
 		assert(j < 6);
 	}
-
-	return((void *)htab);
 }
 
-
 int
-man_hash_find(const void *arg, const char *tmp)
+man_hash_find(const char *tmp)
 {
 	int		 x, i, tok;
-	const int	*htab;
-
-	htab = (const int *)arg;
 
 	if (0 == (x = tmp[0]))
 		return(MAN_MAX);
@@ -84,7 +65,7 @@ man_hash_find(const void *arg, const char *tmp)
 	x *= 6;
 
 	for (i = 0; i < 6; i++) {
-		if (-1 == (tok = htab[x + i]))
+		if (UCHAR_MAX == (tok = table[x + i]))
 			return(MAN_MAX);
 		if (0 == strcmp(tmp, man_macronames[tok]))
 			return(tok);
@@ -92,4 +73,3 @@ man_hash_find(const void *arg, const char *tmp)
 
 	return(MAN_MAX);
 }
-