X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/34499b8564d56a778ba364385e208a4f51fe3e04..8d3eee8a5f2642722d066c30fb64f3e992e958b7:/man_hash.c?ds=sidebyside

diff --git a/man_hash.c b/man_hash.c
index cee44f6e..ab887226 100644
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,6 +1,6 @@
-/*	$Id: man_hash.c,v 1.17 2010/03/23 21:50:43 kristaps Exp $ */
+/*	$Id: man_hash.c,v 1.27 2014/04/20 16:46:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,17 +23,16 @@
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <string.h>
 
+#include "man.h"
+#include "mandoc.h"
 #include "libman.h"
 
 #define	HASH_DEPTH	 6
 
 #define	HASH_ROW(x) do { \
-		if ('.' == (x)) \
-			(x) = 26; \
-		else if (isupper((u_char)(x))) \
+		if (isupper((unsigned char)(x))) \
 			(x) -= 65; \
 		else \
 			(x) -= 97; \
@@ -47,7 +46,8 @@
  * macro (the integer value of the enum stored as a char to save a bit
  * of space).
  */
-static	u_char		 table[27 * HASH_DEPTH];
+static	unsigned char	 table[26 * HASH_DEPTH];
+
 
 /*
  * XXX - this hash has global scope, so if intended for use as a library
@@ -60,18 +60,18 @@ man_hash_init(void)
 
 	memset(table, UCHAR_MAX, sizeof(table));
 
-	assert(/* CONSTCOND */ MAN_MAX < UCHAR_MAX);
+	assert(MAN_MAX < UCHAR_MAX);
 
-	for (i = 0; i < MAN_MAX; i++) {
+	for (i = 0; i < (int)MAN_MAX; i++) {
 		x = man_macronames[i][0];
 
-		assert(isalpha((u_char)x) || '.' == x);
+		assert(isalpha((unsigned char)x));
 
 		HASH_ROW(x);
 
 		for (j = 0; j < HASH_DEPTH; j++)
 			if (UCHAR_MAX == table[x + j]) {
-				table[x + j] = (u_char)i;
+				table[x + j] = (unsigned char)i;
 				break;
 			}
 
@@ -79,7 +79,6 @@ man_hash_init(void)
 	}
 }
 
-
 enum mant
 man_hash_find(const char *tmp)
 {
@@ -88,7 +87,7 @@ man_hash_find(const char *tmp)
 
 	if ('\0' == (x = tmp[0]))
 		return(MAN_MAX);
-	if ( ! (isalpha((u_char)x) || '.' == x))
+	if ( ! (isalpha((unsigned char)x)))
 		return(MAN_MAX);
 
 	HASH_ROW(x);