=================================================================== RCS file: /cvs/mandoc/Attic/xstd.c,v retrieving revision 1.4 retrieving revision 1.9 diff -u -p -r1.4 -r1.9 --- mandoc/Attic/xstd.c 2009/01/20 13:44:05 1.4 +++ mandoc/Attic/xstd.c 2009/03/08 19:47:41 1.9 @@ -1,4 +1,4 @@ -/* $Id: xstd.c,v 1.4 2009/01/20 13:44:05 kristaps Exp $ */ +/* $Id: xstd.c,v 1.9 2009/03/08 19:47:41 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -33,6 +33,7 @@ extern size_t strlcat(char *, const char *, size_t); extern size_t strlcpy(char *, const char *, size_t); #endif + int xstrcmp(const char *p1, const char *p2) { @@ -55,6 +56,16 @@ xstrlcpy(char *dst, const char *src, size_t 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) { void *p; @@ -75,7 +86,7 @@ xstrdup(const char *p) } 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; @@ -85,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)) @@ -96,7 +107,7 @@ xstrlcats(char *buf, const struct mdoc_node *n, size_t } #ifdef __linux__ -/* $OpenBSD: xstd.c,v 1.4 2009/01/20 13:44:05 kristaps Exp $ */ +/* $OpenBSD: xstd.c,v 1.9 2009/03/08 19:47:41 kristaps Exp $ */ /* * Copyright (c) 1998 Todd C. Miller