aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2020-08-07 00:05:04 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2020-08-07 00:05:04 +0000
commit4564c8251353af6caf9c1bb8125377f4579dc596 (patch)
treebbd32fb881bf19fb60a13d29d9904b6fbf070f6e
parentMerge branch 'desktop-keywords' into master (diff)
xmalloc: add xrealloc() and xstrndup() functions
-rw-r--r--xmalloc.c13
-rw-r--r--xmalloc.h2
2 files changed, 15 insertions, 0 deletions
diff --git a/xmalloc.c b/xmalloc.c
index 7322953a..ebac8a1d 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -42,12 +42,25 @@ xcalloc(size_t nmemb, size_t size)
return check_alloc(calloc(nmemb, size));
}
+void *
+xrealloc(void *ptr, size_t size)
+{
+ void *alloc = realloc(ptr, size);
+ return unlikely(size == 0) ? alloc : check_alloc(alloc);
+}
+
char *
xstrdup(const char *str)
{
return check_alloc(strdup(str));
}
+char *
+xstrndup(const char *str, size_t n)
+{
+ return check_alloc(strndup(str, n));
+}
+
static VPRINTF(2) int
xvasprintf_(char **strp, const char *format, va_list ap)
{
diff --git a/xmalloc.h b/xmalloc.h
index 90d63031..2c12cf0a 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -5,5 +5,7 @@
void *xmalloc(size_t size) XMALLOC;
void *xcalloc(size_t nmemb, size_t size) XMALLOC;
+void *xrealloc(void *ptr, size_t size);
char *xstrdup(const char *str) XSTRDUP;
+char *xstrndup(const char *str, size_t n) XSTRDUP;
char *xasprintf(const char *format, ...) PRINTF(1) XMALLOC;