===================================================================
RCS file: /cvs/mandoc/Attic/man_hash.c,v
retrieving revision 1.3
retrieving revision 1.16
diff -u -p -r1.3 -r1.16
--- mandoc/Attic/man_hash.c	2009/03/26 09:55:39	1.3
+++ mandoc/Attic/man_hash.c	2010/01/01 17:14:28	1.16
@@ -1,60 +1,81 @@
-/* $Id: man_hash.c,v 1.3 2009/03/26 09:55:39 kristaps Exp $ */
+/*	$Id: man_hash.c,v 1.16 2010/01/01 17:14:28 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * 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>
+
 #include <assert.h>
-#include <ctype.h>
-#include <err.h>
+#include <limits.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "libman.h"
 
-/* ARGUSED */
+static	u_char		table[26 * 6];
+
+/*
+ * 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)
+man_hash_init(void)
 {
+	int		 i, j, x;
 
-	/* Do nothing. */
-}
+	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));
 
-/* ARGUSED */
-void *
-man_hash_alloc(void)
-{
+		x -= (x <= 90) ? 65 : 97;
+		x *= 6;
 
-	/* Do nothing. */
-	return(NULL);
+		for (j = 0; j < 6; j++)
+			if (UCHAR_MAX == table[x + j]) {
+				table[x + j] = (u_char)i;
+				break;
+			}
+		assert(j < 6);
+	}
 }
 
-
 int
-man_hash_find(const void *arg, const char *tmp)
+man_hash_find(const char *tmp)
 {
-	int		 i;
+	int		 x, i, tok;
 
-	/* TODO */
+	if (0 == (x = tmp[0]))
+		return(MAN_MAX);
+	if ( ! ((x >= 65 && x <= 90) || (x >= 97 && x <= 122)))
+		return(MAN_MAX);
 
-	for (i = 0; i < MAN_MAX; i++) 
-		if (0 == strcmp(tmp, man_macronames[i]))
-			return(i);
+	x -= (x <= 90) ? 65 : 97;
+	x *= 6;
 
+	for (i = 0; i < 6; i++) {
+		if (UCHAR_MAX == (tok = table[x + i]))
+			return(MAN_MAX);
+		if (0 == strcmp(tmp, man_macronames[tok]))
+			return(tok);
+	}
+
 	return(MAN_MAX);
 }
-