Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / man_hash.c

diff --git a/man_hash.c b/man_hash.c
index 6524f36e4d29ee1e9793245a13c0e84af163371f..1cbfb1b7f8e63380f41bad644545abe27ca4d4cf 100644 (file)
--- 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.29 2014/12/01 08:05:52 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,25 +14,22 @@
  * 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 "mandoc.h"
+#include "man.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 +43,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 +57,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 +76,6 @@ man_hash_init(void)
        }
 }
 
-
 enum mant
 man_hash_find(const char *tmp)
 {
@@ -88,7 +84,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);