More ndebug fixes

diff --git a/src/lib/util/atexit.c b/src/lib/util/atexit.c
index 1e8def741ee2b2841293389bb1fcdced7651fed6..f7745dd44742a3a7a2d1b0fa28f4ee75bd198002 100644 (file)
--- 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 7ae8240a076a2a8295545c54d169e55c659e7c65..01f825ad50ee68eeda0d032267d83d4bc63b236a 100644 (file)
--- 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;