FreeBSD sys/types inclusion fixed.

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index c4d7e7b12a37d5dc0041c7c9a6063fe93e50c3e9..580a1cafa448c7c92e69865c951f188a769d308f 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.8 2009/09/23 09:06:44 kristaps Exp $ */
+/*     $Id: chars.c,v 1.13 2009/11/05 07:21:01 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
-#include <err.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -35,10 +35,10 @@ struct      ln {
        int               type;
 #define        CHARS_CHAR       (1 << 0)
 #define        CHARS_STRING     (1 << 1)
-#define CHARS_BOTH      (0x03)
+#define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 
-#define        LINES_MAX         337
+#define        LINES_MAX         351
 
 #define CHAR(w, x, y, z, a, b) \
        { NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR },
@@ -47,9 +47,10 @@ struct       ln {
 #define BOTH(w, x, y, z, a, b) \
        { NULL, (w), (y), (a), (x), (z), (b), CHARS_BOTH },
 
-static struct ln lines[LINES_MAX] = {
+#define        CHAR_TBL_START    static struct ln lines[LINES_MAX] = {
+#define        CHAR_TBL_END      };
+
 #include "chars.in"
-};
 
 struct tbl {
        enum chars        type;
@@ -89,13 +90,17 @@ chars_init(enum chars type)
         * (they're in-line re-ordered during lookup).
         */
 
-       if (NULL == (tab = malloc(sizeof(struct tbl))))
-               err(1, "malloc");
-       tab->type = type;
+       tab = malloc(sizeof(struct tbl));
+       if (NULL == tab) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }
 
        htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
-       if (NULL == htab)
-               err(1, "malloc");
+       if (NULL == htab) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }
 
        for (i = 0; i < LINES_MAX; i++) {
                hash = (int)lines[i].code[0] - PRINT_LO;
@@ -111,6 +116,7 @@ chars_init(enum chars type)
        }
 
        tab->htab = htab;
+       tab->type = type;
        return(tab);
 }