From 3297616efa05565b7944a83b11a9aabcdde08986 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Thu, 2 Jun 2016 20:38:24 +0800 Subject: Add assert and __attribute__((nonnull)) on xStrdup __attribute__((nonnull)) will help catching "calling with NULL" mistake on compile time. I also convert xStrdup into a macro, that will do assert() inline when the code is *not* built with -DNDEBUG . For release builds (with -DNDEBUG), preprocessor trick will ensure that generated code remains the same. --- XAlloc.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'XAlloc.h') diff --git a/XAlloc.h b/XAlloc.h index 3cc060d9..22a6e8ab 100644 --- a/XAlloc.h +++ b/XAlloc.h @@ -15,6 +15,18 @@ void* xCalloc(size_t nmemb, size_t size); void* xRealloc(void* ptr, size_t size); -char* xStrdup(const char* str); +#undef xStrdup +#undef xStrdup_ +#ifdef NDEBUG +# define xStrdup_ xStrdup +#else +# define xStrdup(str_) (assert(str_), xStrdup_(str_)) +#endif + +#if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) +char* xStrdup_(const char* str) __attribute__((nonnull)); +#endif // GNU C 3.3 or later + +char* xStrdup_(const char* str); #endif -- cgit v1.2.3