===================================================================
RCS file: /cvs/mandoc/Attic/man_hash.c,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- mandoc/Attic/man_hash.c	2009/04/05 16:34:22	1.6
+++ mandoc/Attic/man_hash.c	2009/06/18 10:32:00	1.10
@@ -1,20 +1,18 @@
-/* $Id: man_hash.c,v 1.6 2009/04/05 16:34:22 kristaps Exp $ */
+/*	$Id: man_hash.c,v 1.10 2009/06/18 10:32:00 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.
  */
 #include <assert.h>
 #include <stdlib.h>
@@ -39,11 +37,15 @@ man_hash_alloc(void)
 	int		*htab;
 	int		 i, j, x;
 
-	htab = calloc(26 * 5, sizeof(int));
+	/* Initialised to -1. */
+
+	htab = malloc(26 * 5 * sizeof(int));
 	if (NULL == htab)
 		return(NULL);
+	for (i = 0; i < 26 * 5; i++)
+		htab[i] = -1;
 
-	for (i = 1; i < MAN_MAX; i++) {
+	for (i = 0; i < MAN_MAX; i++) {
 		x = man_macronames[i][0];
 
 		assert((x >= 65 && x <= 90) ||
@@ -53,7 +55,7 @@ man_hash_alloc(void)
 		x *= 5;
 
 		for (j = 0; j < 5; j++)
-			if (0 == htab[x + j]) {
+			if (-1 == htab[x + j]) {
 				htab[x + j] = i;
 				break;
 			}
@@ -82,7 +84,7 @@ man_hash_find(const void *arg, const char *tmp)
 	x *= 5;
 
 	for (i = 0; i < 5; i++) {
-		if (0 == (tok = htab[x + i]))
+		if (-1 == (tok = htab[x + i]))
 			return(MAN_MAX);
 		if (0 == strcmp(tmp, man_macronames[tok]))
 			return(tok);