X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/d83a6d58a4b43c863cd31445faaab780577c2cb3..dcd90e7955626a38ed974eeba3b599fb534e7b62:/man_hash.c

diff --git a/man_hash.c b/man_hash.c
index 6524f36e..c52add28 100644
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,4 +1,4 @@
-/*	$Id: man_hash.c,v 1.23 2010/07/31 23:52:58 schwarze Exp $ */
+/*	$Id: man_hash.c,v 1.28 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,25 +14,23 @@
  * 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 <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 (isupper((u_char)(x))) \
+		if (isupper((unsigned char)(x))) \
 			(x) -= 65; \
 		else \
 			(x) -= 97; \
@@ -46,7 +44,8 @@
  * macro (the integer value of the enum stored as a char to save a bit
  * of space).
  */
-static	u_char		 table[26 * HASH_DEPTH];
+static	unsigned char	 table[26 * HASH_DEPTH];
+
 
 /*
  * XXX - this hash has global scope, so if intended for use as a library
@@ -59,19 +58,18 @@ man_hash_init(void)
 
 	memset(table, UCHAR_MAX, sizeof(table));
 
-	assert(/* LINTED */ 
-			MAN_MAX < UCHAR_MAX);
+	assert(MAN_MAX < UCHAR_MAX);
 
 	for (i = 0; i < (int)MAN_MAX; i++) {
 		x = man_macronames[i][0];
 
-		assert(isalpha((u_char)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 +77,6 @@ man_hash_init(void)
 	}
 }
 
-
 enum mant
 man_hash_find(const char *tmp)
 {
@@ -88,7 +85,7 @@ man_hash_find(const char *tmp)
 
 	if ('\0' == (x = tmp[0]))
 		return(MAN_MAX);
-	if ( ! (isalpha((u_char)x)))
+	if ( ! (isalpha((unsigned char)x)))
 		return(MAN_MAX);
 
 	HASH_ROW(x);