From 71164747ce50015963a7daefe9351225640f6510 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Jul 2025 17:58:15 +0200 Subject: [PATCH] move `Curl_safefree()` definition to curl_setup.h --- lib/curl_setup.h | 8 ++++++++ lib/memdebug.h | 14 -------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 5915d5a496..d9396e511c 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -981,6 +981,14 @@ extern curl_realloc_callback Curl_crealloc; extern curl_strdup_callback Curl_cstrdup; extern curl_calloc_callback Curl_ccalloc; +/* + * Curl_safefree defined as a macro to allow MemoryTracking feature + * to log free() calls at same location where Curl_safefree is used. + * This macro also assigns NULL to given pointer when free'd. + */ +#define Curl_safefree(ptr) \ + do { free((ptr)); (ptr) = NULL;} while(0) + #ifdef CURLDEBUG #define CURL_GETADDRINFO(host,serv,hint,res) \ curl_dbg_getaddrinfo(host, serv, hint, res, __LINE__, __FILE__) diff --git a/lib/memdebug.h b/lib/memdebug.h index e35e7c1c2a..e24915cab8 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -186,18 +186,4 @@ CURL_EXTERN ALLOC_FUNC #define fake_sclose(x) Curl_nop_stmt #endif /* CURLDEBUG */ - -/* -** Following section applies even when CURLDEBUG is not defined. -*/ - -/* - * Curl_safefree defined as a macro to allow MemoryTracking feature - * to log free() calls at same location where Curl_safefree is used. - * This macro also assigns NULL to given pointer when free'd. - */ - -#define Curl_safefree(ptr) \ - do { free((ptr)); (ptr) = NULL;} while(0) - #endif /* HEADER_CURL_MEMDEBUG_H */