From 1e01cd1f48bff3fdd12f45bf1c3adfab821ee287 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 5 Jan 2010 10:48:32 -0600 Subject: Correct return types of xstrdup() and xstrndup() --- lib/lib.c | 4 ++-- lib/lib.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/lib.c b/lib/lib.c index e4b9d8eb..48689d3d 100644 --- a/lib/lib.c +++ b/lib/lib.c @@ -106,7 +106,7 @@ void *xrealloc(void *ptr, size_t size) } // Die unless we can allocate a copy of this many bytes of string. -void *xstrndup(char *s, size_t n) +char *xstrndup(char *s, size_t n) { char *ret = xmalloc(++n); strncpy(ret, s, n); @@ -116,7 +116,7 @@ void *xstrndup(char *s, size_t n) } // Die unless we can allocate a copy of this string. -void *xstrdup(char *s) +char *xstrdup(char *s) { return xstrndup(s, strlen(s)); } diff --git a/lib/lib.h b/lib/lib.h index 61e80cf9..c6226aae 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -54,8 +54,8 @@ void perror_exit(char *msg, ...) noreturn; void *xmalloc(size_t size); void *xzalloc(size_t size); void *xrealloc(void *ptr, size_t size); -void *xstrndup(char *s, size_t n); -void *xstrdup(char *s); +char *xstrndup(char *s, size_t n); +char *xstrdup(char *s); char *xmsprintf(char *format, ...); void xprintf(char *format, ...); void xputs(char *s); -- cgit v1.2.3