Without HAVE_ERR, don't try to include <err.h>, it probably isn't there.

[mandoc.git] / tag.c

diff --git a/tag.c b/tag.c
index 4167336fcdc7ddb5b9c7e90e526fd93eb39f54a8..5766d540d1f1d246dc97a7a61615f0199c835472 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/*      $Id: tag.c,v 1.7 2015/08/29 15:28:13 schwarze Exp $    */
+/*      $Id: tag.c,v 1.10 2015/10/13 15:53:05 schwarze Exp $    */
 /*
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -26,13 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_OHASH
-#include <ohash.h>
-#else
-#include "compat_ohash.h"
-#endif
-
 #include "mandoc_aux.h"
+#include "mandoc_ohash.h"
 #include "tag.h"
 
 struct tag_entry {
@@ -42,9 +37,6 @@ struct tag_entry {
 };
 
 static void     tag_signal(int);
-static void    *tag_alloc(size_t, void *);
-static void     tag_free(void *, void *);
-static void    *tag_calloc(size_t, size_t, void *);
 
 static struct ohash     tag_data;
 static struct tag_files         tag_files;
@@ -58,7 +50,6 @@ static struct tag_files        tag_files;
 struct tag_files *
 tag_init(void)
 {
-       struct ohash_info        tag_info;
        int                      ofd;
 
        ofd = -1;
@@ -91,13 +82,8 @@ tag_init(void)
         * where various marked-up terms are documented.
         */
 
-       tag_info.alloc = tag_alloc;
-       tag_info.calloc = tag_calloc;
-       tag_info.free = tag_free;
-       tag_info.key_offset = offsetof(struct tag_entry, s);
-       tag_info.data = NULL;
-       ohash_init(&tag_data, 4, &tag_info);
-       return(&tag_files);
+       mandoc_ohash_init(&tag_data, 4, offsetof(struct tag_entry, s));
+       return &tag_files;
 
 fail:
        tag_unlink();
@@ -111,7 +97,7 @@ fail:
        *tag_files.tfn = '\0';
        tag_files.ofd = -1;
        tag_files.tfd = -1;
-       return(NULL);
+       return NULL;
 }
 
 /*
@@ -125,7 +111,7 @@ tag_put(const char *s, int prio, size_t line)
        size_t                   len;
        unsigned int             slot;
 
-       if (tag_files.tfd <= 0)
+       if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL)
                return;
        slot = ohash_qlookup(&tag_data, s);
        entry = ohash_find(&tag_data, slot);
@@ -187,27 +173,3 @@ tag_signal(int signum)
        /* NOTREACHED */
        _exit(1);
 }
-
-/*
- * Memory management callback functions for ohash.
- */
-static void *
-tag_alloc(size_t sz, void *arg)
-{
-
-       return(mandoc_malloc(sz));
-}
-
-static void *
-tag_calloc(size_t nmemb, size_t sz, void *arg)
-{
-
-       return(mandoc_calloc(nmemb, sz));
-}
-
-static void
-tag_free(void *p, void *arg)
-{
-
-       free(p);
-}