John Gardner: handling of ASCII control characters during input

[mandoc.git] / compat_ohash.h

diff --git a/compat_ohash.h b/compat_ohash.h
index d07df18e646c408d0248d61bef6d4c1ceb08e840..58fb220c96c0e91212b45d43d3098fc483e4eddb 100644 (file)
--- a/compat_ohash.h
+++ b/compat_ohash.h
@@ -27,8 +27,8 @@
 struct ohash_info {
        ptrdiff_t key_offset;
        void *data;     /* user data */
-       void *(*halloc)(size_t, void *);
-       void (*hfree)(void *, size_t, void *);
+       void *(*calloc)(size_t, size_t, void *);
+       void (*free)(void *, void *);
        void *(*alloc)(size_t, void *);
 };
 
@@ -49,15 +49,13 @@ struct ohash {
  * a hashing table index (opaque) to be used in find/insert/remove.
  * The keys are stored at a known position in the client data.
  */
-__BEGIN_DECLS
 void ohash_init(struct ohash *, unsigned, struct ohash_info *);
 void ohash_delete(struct ohash *);
 
 unsigned int ohash_lookup_interval(struct ohash *, const char *,
            const char *, uint32_t);
 unsigned int ohash_lookup_memory(struct ohash *, const char *,
-           size_t, uint32_t)
-               __attribute__ ((__bounded__(__string__,2,3)));
+           size_t, uint32_t);
 void *ohash_find(struct ohash *, unsigned int);
 void *ohash_remove(struct ohash *, unsigned int);
 void *ohash_insert(struct ohash *, unsigned int, void *);
@@ -70,5 +68,5 @@ uint32_t ohash_interval(const char *, const char **);
 
 unsigned int ohash_qlookupi(struct ohash *, const char *, const char **);
 unsigned int ohash_qlookup(struct ohash *, const char *);
-__END_DECLS
+
 #endif