Clean-up fallout: differentiate ID's and HREF's (where to put the `#').

Make buffmt functions internally bufinit(), too.

2 files changed, 3 insertions, 3 deletions

diff --git a/html.c b/html.c
index e8801610..6313e4c3 100644
--- a/html.c
+++ b/html.c
@@ -656,6 +656,7 @@ buffmt_includes(struct html *h, const char *name)
 
 	pp = h->base_includes;
 	
+	bufinit(h);
 	while (NULL != (p = strchr(pp, '%'))) {
 		bufncat(h, pp, (size_t)(p - pp));
 		switch (*(p + 1)) {
@@ -680,7 +681,7 @@ buffmt_man(struct html *h,
 
 	pp = h->base_man;
 	
-	/* LINTED */
+	bufinit(h);
 	while (NULL != (p = strchr(pp, '%'))) {
 		bufncat(h, pp, (size_t)(p - pp));
 		switch (*(p + 1)) {
@@ -718,8 +719,6 @@ bufcat_id(struct html *h, const char *src)
 
 	/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
-	if (0 == h->buflen)
-		bufcat(h, "#x");
 	while ('\0' != *src)
 		bufcat_fmt(h, "%.2x", *src++);
 }
diff --git a/mdoc_html.c b/mdoc_html.c
index 11713554..226c4205 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1171,6 +1171,7 @@ mdoc_sx_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 
 	bufinit(h);
+	bufcat(h, "#x");
 	for (n = n->child; n; n = n->next) {
 		bufcat_id(h, n->string);
 		if (n->next)