Fill mode changes don't break next-line scope in all cases,

[mandoc.git] / mdoc_hash.c

diff --git a/mdoc_hash.c b/mdoc_hash.c
index db30ee602a8b9a4b38e741577cd163fdb3f2f709..13cf227a2f252a0e88a00ac5049faed36b91e58a 100644 (file)
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_hash.c,v 1.20 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: mdoc_hash.c,v 1.25 2015/04/19 14:00:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,9 +14,7 @@
  * 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>
 
@@ -27,22 +25,22 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "roff.h"
 #include "mdoc.h"
 #include "libmdoc.h"
 
 static unsigned char    table[27 * 12];
 
 
-/*
- * XXX - this hash has global scope, so if intended for use as a library
- * with multiple callers, it will need re-invocation protection.
- */
 void
 mdoc_hash_init(void)
 {
        int              i, j, major;
        const char      *p;
 
+       if (*table != '\0')
+               return;
+
        memset(table, UCHAR_MAX, sizeof(table));
 
        for (i = 0; i < (int)MDOC_MAX; i++) {
@@ -63,32 +61,32 @@ mdoc_hash_init(void)
        }
 }
 
-enum mdoct
+int
 mdoc_hash_find(const char *p)
 {
        int               major, i, j;
 
        if (0 == p[0])
-               return(MDOC_MAX);
+               return(TOKEN_NONE);
        if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
-               return(MDOC_MAX);
+               return(TOKEN_NONE);
 
        if (isalpha((unsigned char)p[1]))
                major = 12 * (tolower((unsigned char)p[1]) - 97);
        else if ('1' == p[1])
                major = 12 * 26;
        else
-               return(MDOC_MAX);
+               return(TOKEN_NONE);
 
        if (p[2] && p[3])
-               return(MDOC_MAX);
+               return(TOKEN_NONE);
 
        for (j = 0; j < 12; j++) {
                if (UCHAR_MAX == (i = table[major + j]))
                        break;
                if (0 == strcmp(p, mdoc_macronames[i]))
-                       return((enum mdoct)i);
+                       return(i);
        }
 
-       return(MDOC_MAX);
+       return(TOKEN_NONE);
 }