Back out lorder, which doesn't seem necessary (?). I think this means all

[mandoc.git] / man_hash.c

diff --git a/man_hash.c b/man_hash.c
index 587baeda22299cbe8a9f7387a47603fd839084d0..86c5c40a199b8c62d8e166ccac3669fde1e42ed6 100644 (file)
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,6 +1,6 @@
-/*     $Id: man_hash.c,v 1.18 2010/03/27 10:14:32 kristaps Exp $ */
+/*     $Id: man_hash.c,v 1.25 2011/07/24 18:15:14 kristaps 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
@@ -26,14 +26,14 @@
 #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 ('.' == (x)) \
-                       (x) = 26; \
-               else if (isupper((u_char)(x))) \
+               if (isupper((unsigned char)(x))) \
                        (x) -= 65; \
                else \
                        (x) -= 97; \
@@ -47,7 +47,7 @@
  * macro (the integer value of the enum stored as a char to save a bit
  * of space).
  */
-static u_char           table[27 * HASH_DEPTH];
+static unsigned char    table[26 * HASH_DEPTH];
 
 /*
  * XXX - this hash has global scope, so if intended for use as a library
@@ -63,16 +63,16 @@ man_hash_init(void)
        assert(/* LINTED */ 
                        MAN_MAX < UCHAR_MAX);
 
-       for (i = 0; i < MAN_MAX; i++) {
+       for (i = 0; i < (int)MAN_MAX; i++) {
                x = man_macronames[i][0];
 
-               assert(isalpha((u_char)x) || '.' == 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;
                        }
 
@@ -89,7 +89,7 @@ man_hash_find(const char *tmp)
 
        if ('\0' == (x = tmp[0]))
                return(MAN_MAX);
-       if ( ! (isalpha((u_char)x) || '.' == x))
+       if ( ! (isalpha((unsigned char)x)))
                return(MAN_MAX);
 
        HASH_ROW(x);