===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_hash.c,v
retrieving revision 1.9
retrieving revision 1.23
diff -u -p -r1.9 -r1.23
--- mandoc/Attic/mdoc_hash.c	2009/09/16 14:40:56	1.9
+++ mandoc/Attic/mdoc_hash.c	2015/04/02 22:48:17	1.23
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_hash.c,v 1.9 2009/09/16 14:40:56 kristaps Exp $ */
+/*	$Id: mdoc_hash.c,v 1.23 2015/04/02 22:48:17 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -23,11 +25,17 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "roff.h"
+#include "mdoc.h"
 #include "libmdoc.h"
 
-static	unsigned char	table[27 * 12];
+static	unsigned char	 table[27 * 12];
 
 
+/*
+ * XXX - this hash has global scope, so if intended for use as a library
+ * with multiple callers, it will need re-invocation protection.
+ */
 void
 mdoc_hash_init(void)
 {
@@ -36,17 +44,17 @@ mdoc_hash_init(void)
 
 	memset(table, UCHAR_MAX, sizeof(table));
 
-	for (i = 0; i < MDOC_MAX; i++) {
+	for (i = 0; i < (int)MDOC_MAX; i++) {
 		p = mdoc_macronames[i];
 
-		if (isalpha((u_char)p[1]))
-			major = 12 * (tolower((u_char)p[1]) - 97);
+		if (isalpha((unsigned char)p[1]))
+			major = 12 * (tolower((unsigned char)p[1]) - 97);
 		else
 			major = 12 * 26;
 
 		for (j = 0; j < 12; j++)
 			if (UCHAR_MAX == table[major + j]) {
-				table[major + j] = i;
+				table[major + j] = (unsigned char)i;
 				break;
 			}
 
@@ -54,7 +62,6 @@ mdoc_hash_init(void)
 	}
 }
 
-
 int
 mdoc_hash_find(const char *p)
 {
@@ -62,14 +69,14 @@ mdoc_hash_find(const char *p)
 
 	if (0 == p[0])
 		return(MDOC_MAX);
-	if ( ! isalpha((u_char)p[0]) && '%' != p[0])
+	if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
 		return(MDOC_MAX);
 
-	if (isalpha((u_char)p[1]))
-		major = 12 * (tolower((u_char)p[1]) - 97);
+	if (isalpha((unsigned char)p[1]))
+		major = 12 * (tolower((unsigned char)p[1]) - 97);
 	else if ('1' == p[1])
 		major = 12 * 26;
-	else 
+	else
 		return(MDOC_MAX);
 
 	if (p[2] && p[3])
@@ -84,4 +91,3 @@ mdoc_hash_find(const char *p)
 
 	return(MDOC_MAX);
 }
-