From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 11 Apr 2022 16:41:28 +0000 (-0500)
Subject: More ndebug fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcf0424994641c4b8d7ed6c7246de3e267b502db;p=thirdparty%2Ffreeradius-server.git

More ndebug fixes
---

diff --git a/src/lib/util/atexit.c b/src/lib/util/atexit.c
index 1e8def741e..f7745dd447 100644
--- a/src/lib/util/atexit.c
+++ b/src/lib/util/atexit.c
@@ -398,8 +398,9 @@ int fr_atexit_thread_trigger_all(void)
 			if (talloc_free(to_free) < 0) {
 				fr_strerror_printf_push("atexit handler failed %p/%p func=%p, uctx=%p"
 #ifndef NDEBUG
-							" (alloced %s:%u)",
+							" (alloced %s:%u)"
 #endif
+							,
 							list, to_free,
 							to_free->func, to_free->uctx
 #ifndef NDEBUG
@@ -504,8 +505,9 @@ int fr_atexit_global_trigger_all(void)
 		if (talloc_free(to_free) < 0) {
 			fr_strerror_printf_push("atexit handler failed %p/%p func=%p, uctx=%p"
 #ifndef NDEBUG
-						" (alloced %s:%u)",
+						" (alloced %s:%u)"
 #endif
+						,
 						fr_atexit_global, to_free,
 						to_free->func, to_free->uctx
 #ifndef NDEBUG
@@ -557,8 +559,9 @@ int fr_atexit_trigger(bool uctx_scope, fr_atexit_t func, void const *uctx)
 		if (talloc_free(to_free) < 0) {
 			fr_strerror_printf_push("atexit handler failed %p/%p func=%p, uctx=%p"
 #ifndef NDEBUG
-						" (alloced %s:%u)",
+						" (alloced %s:%u)"
 #endif
+						,
 						fr_atexit_global, to_free,
 						to_free->func, to_free->uctx
 #ifndef NDEBUG
@@ -597,8 +600,9 @@ do_threads:
 			if (talloc_free(to_free) < 0) {
 				fr_strerror_printf_push("atexit handler failed %p/%p func=%p, uctx=%p"
 #ifndef NDEBUG
-							" (alloced %s:%u)",
+							" (alloced %s:%u)"
 #endif
+							,
 							list, to_free,
 							to_free->func, to_free->uctx
 #ifndef NDEBUG
diff --git a/src/lib/util/dlist.h b/src/lib/util/dlist.h
index 7ae8240a07..01f825ad50 100644
--- a/src/lib/util/dlist.h
+++ b/src/lib/util/dlist.h
@@ -697,7 +697,8 @@ static inline void *fr_dlist_replace(fr_dlist_head_t *list_head, void *item, voi
  * Does nothing if the list was not initialised with #fr_dlist_talloc_init.
  */
 #ifndef TALLOC_GET_TYPE_ABORT_NOOP
-static inline CC_HINT(nonnull) void fr_dlist_verify(char const *file, int line, fr_dlist_head_t const *list_head)
+static inline CC_HINT(nonnull) void fr_dlist_verify(NDEBUG_UNUSED char const *file, NDEBUG_UNUSED int line,
+						    fr_dlist_head_t const *list_head)
 {
 	void *item;