From 736c496dbf15c1a665ba7e0b03d7994117a0b215 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Fri, 18 Sep 2020 20:39:50 +0200 Subject: [PATCH] Cleanse xStrdup mess --- XAlloc.c | 2 +- XAlloc.h | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/XAlloc.c b/XAlloc.c index c43eca76..20ddafc8 100644 --- a/XAlloc.c +++ b/XAlloc.c @@ -67,7 +67,7 @@ int xSnprintf(char* buf, int len, const char* fmt, ...) { return _n; } -char* xStrdup_(const char* str) { +char* xStrdup(const char* str) { char* data = strdup(str); if (!data) { fail(); diff --git a/XAlloc.h b/XAlloc.h index 70dfc59f..32389e57 100644 --- a/XAlloc.h +++ b/XAlloc.h @@ -25,14 +25,6 @@ int xAsprintf(char **strp, const char* fmt, ...); ATTR_FORMAT(printf, 3, 4) int xSnprintf(char *buf, int len, const char* fmt, ...); -#undef xStrdup -#undef xStrdup_ -#ifdef NDEBUG -# define xStrdup_ xStrdup -#else -# define xStrdup(str_) (assert(str_), xStrdup_(str_)) -#endif - -char* xStrdup_(const char* str) ATTR_NONNULL; +char* xStrdup(const char* str) ATTR_NONNULL; #endif