Clean up error reporting:

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index 5158612a32b055e3179972fbf082d1c0dc48e441..baa560034ff97e37fa4437873b0eb16ba7e68180 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,6 +1,6 @@
-/*     $Id: chars.c,v 1.46 2011/05/24 21:31:23 kristaps Exp $ */
+/*     $Id: chars.c,v 1.57 2014/04/20 16:46:04 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,11 +21,11 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 
 #define        PRINT_HI         126
@@ -38,7 +38,7 @@ struct        ln {
        int               unicode;
 };
 
-#define        LINES_MAX         325
+#define        LINES_MAX         330
 
 #define CHAR(in, ch, code) \
        { NULL, (in), (ch), (code) },
@@ -52,8 +52,9 @@ struct        mchars {
        struct ln       **htab;
 };
 
-static inline int        match(const struct ln *, const char *, size_t);
-static const struct ln  *find(struct mchars *, const char *, size_t);
+static const struct ln  *find(const struct mchars *,
+                               const char *, size_t);
+
 
 void
 mchars_free(struct mchars *arg)
@@ -74,12 +75,11 @@ mchars_alloc(void)
        /*
         * Constructs a very basic chaining hashtable.  The hash routine
         * is simply the integral value of the first character.
-        * Subsequent entries are chained in the order they're processed
-        * (they're in-line re-ordered during lookup).
+        * Subsequent entries are chained in the order they're processed.
         */
 
        tab = mandoc_malloc(sizeof(struct mchars));
-       htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
+       htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln *));
 
        for (i = 0; i < LINES_MAX; i++) {
                hash = (int)lines[i].code[0] - PRINT_LO;
@@ -98,12 +98,8 @@ mchars_alloc(void)
        return(tab);
 }
 
-
-/* 
- * Special character to Unicode codepoint.
- */
 int
-mchars_spec2cp(struct mchars *arg, const char *p, size_t sz)
+mchars_spec2cp(const struct mchars *arg, const char *p, size_t sz)
 {
        const struct ln *ln;
 
@@ -113,103 +109,61 @@ mchars_spec2cp(struct mchars *arg, const char *p, size_t sz)
        return(ln->unicode);
 }
 
-/*
- * Numbered character string to ASCII codepoint.
- * This can only be a printable character (i.e., alnum, punct, space) so
- * prevent the character from ruining our state (backspace, newline, and
- * so on).
- * If the character is illegal, returns '\0'.
- */
 char
 mchars_num2char(const char *p, size_t sz)
 {
-       int               i;
+       int       i;
 
-       if ((i = mandoc_strntou(p, sz, 10)) < 0)
+       if ((i = mandoc_strntoi(p, sz, 10)) < 0)
                return('\0');
-       return(isprint(i) ? i : '\0');
+
+       return(i > 0 && i < 256 && isprint(i) ? i : '\0');
 }
 
-/*
- * Hex character string to Unicode codepoint.
- * If the character is illegal, returns '\0'.
- */
 int
 mchars_num2uc(const char *p, size_t sz)
 {
-       int               i;
+       int      i;
 
-       if ((i = mandoc_strntou(p, sz, 16)) < 0)
+       if ((i = mandoc_strntoi(p, sz, 16)) < 0)
                return('\0');
        /* FIXME: make sure we're not in a bogus range. */
        return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
 }
 
-/* 
- * Special character to string array.
- */
 const char *
-mchars_spec2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz)
+mchars_spec2str(const struct mchars *arg,
+               const char *p, size_t sz, size_t *rsz)
 {
        const struct ln *ln;
 
        ln = find(arg, p, sz);
-       if (NULL == ln)
+       if (NULL == ln) {
+               *rsz = 1;
                return(NULL);
+       }
 
        *rsz = strlen(ln->ascii);
        return(ln->ascii);
 }
 
 static const struct ln *
-find(struct mchars *tab, const char *p, size_t sz)
+find(const struct mchars *tab, const char *p, size_t sz)
 {
-       struct ln        *pp, *prev;
-       struct ln       **htab;
+       const struct ln  *pp;
        int               hash;
 
        assert(p);
-       if (0 == sz)
-               return(NULL);
 
-       if (p[0] < PRINT_LO || p[0] > PRINT_HI)
+       if (0 == sz || p[0] < PRINT_LO || p[0] > PRINT_HI)
                return(NULL);
 
-       /*
-        * Lookup the symbol in the symbol hash.  See ascii2htab for the
-        * hashtable specs.  This dynamically re-orders the hash chain
-        * to optimise for repeat hits.
-        */
-
        hash = (int)p[0] - PRINT_LO;
-       htab = tab->htab;
-
-       if (NULL == (pp = htab[hash]))
-               return(NULL);
-
-       for (prev = NULL; pp; pp = pp->next) {
-               if ( ! match(pp, p, sz)) {
-                       prev = pp;
-                       continue;
-               }
 
-               if (prev) {
-                       prev->next = pp->next;
-                       pp->next = htab[hash];
-                       htab[hash] = pp;
-               }
-
-               return(pp);
-       }
+       for (pp = tab->htab[hash]; pp; pp = pp->next)
+               if (0 == strncmp(pp->code, p, sz) &&
+                   '\0' == pp->code[(int)sz])
+                       return(pp);
 
        return(NULL);
 }
-
-static inline int
-match(const struct ln *ln, const char *p, size_t sz)
-{
-
-       if (strncmp(ln->code, p, sz))
-               return(0);
-       return('\0' == ln->code[(int)sz]);
-}