fix a typo that prevented names from .Dt from getting priority

[mandoc.git] / man_hash.c

diff --git a/man_hash.c b/man_hash.c
index 1cbfb1b7f8e63380f41bad644545abe27ca4d4cf..bb7b4665b348675e47085488766286f69daf4fba 100644 (file)
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,6 +1,7 @@
-/*     $Id: man_hash.c,v 1.29 2014/12/01 08:05:52 schwarze Exp $ */
+/*     $Id: man_hash.c,v 1.35 2016/07/15 18:03:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +24,10 @@
 #include <limits.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "roff.h"
 #include "man.h"
+#include "libmandoc.h"
 #include "libman.h"
 
 #define        HASH_DEPTH       6
@@ -46,18 +50,15 @@
 static unsigned char    table[26 * HASH_DEPTH];
 
 
-/*
- * XXX - this hash has global scope, so if intended for use as a library
- * with multiple callers, it will need re-invocation protection.
- */
 void
 man_hash_init(void)
 {
        int              i, j, x;
 
-       memset(table, UCHAR_MAX, sizeof(table));
+       if (*table != '\0')
+               return;
 
-       assert(MAN_MAX < UCHAR_MAX);
+       memset(table, UCHAR_MAX, sizeof(table));
 
        for (i = 0; i < (int)MAN_MAX; i++) {
                x = man_macronames[i][0];
@@ -76,27 +77,27 @@ man_hash_init(void)
        }
 }
 
-enum mant
+int
 man_hash_find(const char *tmp)
 {
        int              x, y, i;
-       enum mant        tok;
+       int              tok;
 
        if ('\0' == (x = tmp[0]))
-               return(MAN_MAX);
+               return TOKEN_NONE;
        if ( ! (isalpha((unsigned char)x)))
-               return(MAN_MAX);
+               return TOKEN_NONE;
 
        HASH_ROW(x);
 
        for (i = 0; i < HASH_DEPTH; i++) {
                if (UCHAR_MAX == (y = table[x + i]))
-                       return(MAN_MAX);
+                       return TOKEN_NONE;
 
-               tok = (enum mant)y;
+               tok = y;
                if (0 == strcmp(tmp, man_macronames[tok]))
-                       return(tok);
+                       return tok;
        }
 
-       return(MAN_MAX);
+       return TOKEN_NONE;
 }