===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- mandoc/mdoc.c	2009/03/31 13:50:19	1.73
+++ mandoc/mdoc.c	2009/04/02 06:51:44	1.74
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.73 2009/03/31 13:50:19 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.74 2009/04/02 06:51:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -180,7 +180,7 @@ mdoc_free(struct mdoc *mdoc)
 
 	mdoc_free1(mdoc);
 	if (mdoc->htab)
-		mdoc_tokhash_free(mdoc->htab);
+		mdoc_hash_free(mdoc->htab);
 	free(mdoc);
 }
 
@@ -192,16 +192,18 @@ mdoc_alloc(void *data, int pflags, const struct mdoc_c
 
 	if (NULL == (p = calloc(1, sizeof(struct mdoc))))
 		return(NULL);
+	if (cb)
+		(void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 
 	p->data = data;
-	p->htab = mdoc_tokhash_alloc();
 	p->pflags = pflags;
 
-	if (cb)
-		(void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
-
-	if (mdoc_alloc1(p))
+	if (NULL == (p->htab = mdoc_hash_alloc())) {
+		free(p);
+		return(NULL);
+	} else if (mdoc_alloc1(p))
 		return(p);
+
 	free(p);
 	return(NULL);
 }
@@ -624,7 +626,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 		return(1);
 	} 
 	
-	if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {
+	if (MDOC_MAX == (c = mdoc_hash_find(m->htab, mac))) {
 		if ( ! macrowarn(m, ln, mac))
 			goto err;
 		return(1);