aboutsummaryrefslogtreecommitdiff
path: root/xmalloc.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-08-07 10:17:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-08-07 10:17:49 +0000
commite0e3ab0ae7547d67d56184fd6c109eee7c21ba21 (patch)
treebbd32fb881bf19fb60a13d29d9904b6fbf070f6e /xmalloc.c
parentMerge branch 'desktop-keywords' into master (diff)
parentxmalloc: add xrealloc() and xstrndup() functions (diff)
Merge branch 'xstrndup+xrealloc' into master
Diffstat (limited to 'xmalloc.c')
-rw-r--r--xmalloc.c13
1 files changed, 13 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)
{