To better support MLINKS, we will have to split the "docs" database

[mandoc.git] / man_hash.c

diff --git a/man_hash.c b/man_hash.c
index e80a39c46c28c5cf63d8cb79a8cea3daeff17efa..86c5c40a199b8c62d8e166ccac3669fde1e42ed6 100644 (file)
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,6 +1,6 @@
-/*     $Id: man_hash.c,v 1.22 2010/06/19 20:46:28 kristaps Exp $ */
+/*     $Id: man_hash.c,v 1.25 2011/07/24 18:15:14 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -26,13 +26,14 @@
 #include <stdlib.h>
 #include <string.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 { \
 #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; \
                        (x) -= 65; \
                else \
                        (x) -= 97; \


@@ -46,7 +47,7 @@
  * macro (the integer value of the enum stored as a char to save a bit
  * of space).
  */
  * 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
 
 /*
  * XXX - this hash has global scope, so if intended for use as a library


@@ -65,13 +66,13 @@ man_hash_init(void)
        for (i = 0; i < (int)MAN_MAX; i++) {
                x = man_macronames[i][0];
 
        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]) {
 
                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;
                        }
 
                                break;
                        }
 


@@ -88,7 +89,7 @@ man_hash_find(const char *tmp)
 
        if ('\0' == (x = tmp[0]))
                return(MAN_MAX);
 
        if ('\0' == (x = tmp[0]))
                return(MAN_MAX);

-       if ( ! (isalpha((u_char)x)))
+       if ( ! (isalpha((unsigned char)x)))

                return(MAN_MAX);
 
        HASH_ROW(x);
                return(MAN_MAX);
 
        HASH_ROW(x);