===================================================================
RCS file: /cvs/mandoc/Attic/xstd.c,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -p -r1.3 -r1.9
--- mandoc/Attic/xstd.c	2009/01/17 16:15:27	1.3
+++ mandoc/Attic/xstd.c	2009/03/08 19:47:41	1.9
@@ -1,4 +1,4 @@
-/* $Id: xstd.c,v 1.3 2009/01/17 16:15:27 kristaps Exp $ */
+/* $Id: xstd.c,v 1.9 2009/03/08 19:47:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,6 +23,11 @@
 
 #include "private.h"
 
+/*
+ * Contains wrappers for common functions to simplify their general
+ * usage throughout this codebase.
+ */
+
 #ifdef __linux__
 extern	size_t		 strlcat(char *, const char *, size_t);
 extern	size_t		 strlcpy(char *, const char *, size_t);
@@ -36,7 +41,6 @@ xstrcmp(const char *p1, const char *p2)
 	return(0 == strcmp(p1, p2));
 }
 
-
 int
 xstrlcat(char *dst, const char *src, size_t sz)
 {
@@ -44,7 +48,6 @@ xstrlcat(char *dst, const char *src, size_t sz)
 	return(strlcat(dst, src, sz) < sz);
 }
 
-
 int
 xstrlcpy(char *dst, const char *src, size_t sz)
 {
@@ -52,7 +55,15 @@ xstrlcpy(char *dst, const char *src, size_t sz)
 	return(strlcpy(dst, src, sz) < sz);
 }
 
+void *
+xrealloc(void *ptr, size_t sz)
+{
+	void		*p;
 
+	if (NULL == (p = realloc(ptr, sz)))
+		err(EXIT_FAILURE, "realloc");
+	return(p);
+}
 
 void *
 xcalloc(size_t num, size_t sz)
@@ -64,7 +75,6 @@ xcalloc(size_t num, size_t sz)
 	return(p);
 }
 
-
 char *
 xstrdup(const char *p)
 {
@@ -75,9 +85,8 @@ xstrdup(const char *p)
 	return(pp);
 }
 
-
 int
-xstrlcats(char *buf, const struct mdoc_node *n, size_t sz)
+xstrlcpys(char *buf, const struct mdoc_node *n, size_t sz)
 {
 	char		 *p;
 
@@ -87,7 +96,7 @@ xstrlcats(char *buf, const struct mdoc_node *n, size_t
 
 	for ( ; n; n = n->next) {
 		assert(MDOC_TEXT == n->type);
-		p = n->data.text.string;
+		p = n->string;
 		if ( ! xstrlcat(buf, p, sz))
 			return(0);
 		if (n->next && ! xstrlcat(buf, " ", sz))
@@ -97,11 +106,8 @@ xstrlcats(char *buf, const struct mdoc_node *n, size_t
 	return(1);
 }
 
-
-
-
 #ifdef __linux__
-/*	$OpenBSD: xstd.c,v 1.3 2009/01/17 16:15:27 kristaps Exp $	*/
+/*	$OpenBSD: xstd.c,v 1.9 2009/03/08 19:47:41 kristaps Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -150,7 +156,6 @@ strlcat(char *dst, const char *src, size_t siz)
 
 	return(dlen + (s - src));	/* count does not include NUL */
 }
-
 
 size_t
 strlcpy(char *dst, const char *src, size_t siz)