Vastly simplify man(7) block unwinding, similar to mdoc_macro.c 1.171.

[mandoc.git] / mdoc_hash.c

diff --git a/mdoc_hash.c b/mdoc_hash.c
index a1a03094f79701bae798b5a711d19b38711bb758..cd5765110b41cebfe423702fcc3855f1d97ab420 100644 (file)
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_hash.c,v 1.17 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: mdoc_hash.c,v 1.23 2015/04/02 22:48:17 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,11 +25,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "roff.h"
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
-static u_char           table[27 * 12];
+static unsigned char    table[27 * 12];
+
 
 /*
  * XXX - this hash has global scope, so if intended for use as a library
@@ -48,14 +47,14 @@ mdoc_hash_init(void)
        for (i = 0; i < (int)MDOC_MAX; i++) {
                p = mdoc_macronames[i];
 
-               if (isalpha((u_char)p[1]))
-                       major = 12 * (tolower((u_char)p[1]) - 97);
+               if (isalpha((unsigned char)p[1]))
+                       major = 12 * (tolower((unsigned char)p[1]) - 97);
                else
                        major = 12 * 26;
 
                for (j = 0; j < 12; j++)
                        if (UCHAR_MAX == table[major + j]) {
-                               table[major + j] = (u_char)i;
+                               table[major + j] = (unsigned char)i;
                                break;
                        }
 
@@ -63,21 +62,21 @@ mdoc_hash_init(void)
        }
 }
 
-enum mdoct
+int
 mdoc_hash_find(const char *p)
 {
        int               major, i, j;
 
        if (0 == p[0])
                return(MDOC_MAX);
-       if ( ! isalpha((u_char)p[0]) && '%' != p[0])
+       if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
                return(MDOC_MAX);
 
-       if (isalpha((u_char)p[1]))
-               major = 12 * (tolower((u_char)p[1]) - 97);
+       if (isalpha((unsigned char)p[1]))
+               major = 12 * (tolower((unsigned char)p[1]) - 97);
        else if ('1' == p[1])
                major = 12 * 26;
-       else 
+       else
                return(MDOC_MAX);
 
        if (p[2] && p[3])
@@ -87,7 +86,7 @@ mdoc_hash_find(const char *p)
                if (UCHAR_MAX == (i = table[major + j]))
                        break;
                if (0 == strcmp(p, mdoc_macronames[i]))
-                       return((enum mdoct)i);
+                       return(i);
        }
 
        return(MDOC_MAX);