Allow ERRORS in section 4; OpenBSD rev. 1.121.

[mandoc.git] / man_hash.c

diff --git a/man_hash.c b/man_hash.c
index b29e8cdf34db0027f586647d6fd2e8cda866ff3a..9961377ce46e03bd40307175554ccd0a931ce6b3 100644 (file)
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,6 +1,6 @@
-/*     $Id: man_hash.c,v 1.20 2010/05/15 22:49:58 kristaps Exp $ */
+/*     $Id: man_hash.c,v 1.26 2014/03/23 11:25:26 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,15 +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 (isupper((u_char)(x))) \
+               if (isupper((unsigned char)(x))) \
                        (x) -= 65; \
                else \
                        (x) -= 97; \
@@ -45,7 +46,7 @@
  * 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
@@ -64,13 +65,13 @@ man_hash_init(void)
        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;
                        }
 
@@ -87,7 +88,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);