We obviously need man.h and mdoc.h installed as mentioned in mandoc.3.

[mandoc.git] / mdoc_hash.c

diff --git a/mdoc_hash.c b/mdoc_hash.c
index 7f033f4e44730512090a0d9c23c4c596c28ed9cd..a1a03094f79701bae798b5a711d19b38711bb758 100644 (file)
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_hash.c,v 1.9 2009/09/16 14:40:56 kristaps Exp $ */
+/*     $Id: mdoc_hash.c,v 1.17 2011/03/22 14:33:05 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
@@ -14,6 +14,10 @@
  * 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>
 
 #include <assert.h>
@@ -23,11 +27,16 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mdoc.h"
+#include "mandoc.h"
 #include "libmdoc.h"
 
-static unsigned char   table[27 * 12];
-
+static u_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)
 {
@@ -36,7 +45,7 @@ mdoc_hash_init(void)
 
        memset(table, UCHAR_MAX, sizeof(table));
 
-       for (i = 0; i < MDOC_MAX; i++) {
+       for (i = 0; i < (int)MDOC_MAX; i++) {
                p = mdoc_macronames[i];
 
                if (isalpha((u_char)p[1]))
@@ -46,7 +55,7 @@ mdoc_hash_init(void)
 
                for (j = 0; j < 12; j++)
                        if (UCHAR_MAX == table[major + j]) {
-                               table[major + j] = i;
+                               table[major + j] = (u_char)i;
                                break;
                        }
 
@@ -54,8 +63,7 @@ mdoc_hash_init(void)
        }
 }
 
-
-int
+enum mdoct
 mdoc_hash_find(const char *p)
 {
        int               major, i, j;
@@ -79,9 +87,8 @@ mdoc_hash_find(const char *p)
                if (UCHAR_MAX == (i = table[major + j]))
                        break;
                if (0 == strcmp(p, mdoc_macronames[i]))
-                       return(i);
+                       return((enum mdoct)i);
        }
 
        return(MDOC_MAX);
 }
-