Simplify: replace one global flag by one local variable.

[mandoc.git] / mdoc_hash.c

diff --git a/mdoc_hash.c b/mdoc_hash.c
index a1a03094f79701bae798b5a711d19b38711bb758..db30ee602a8b9a4b38e741577cd163fdb3f2f709 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.20 2014/04/20 16:46:05 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -28,10 +28,10 @@
 #include <string.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 +48,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;
                        }
 
@@ -70,14 +70,14 @@ mdoc_hash_find(const char *p)
 
        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])