From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 11 Oct 2021 16:38:16 +0000 (-0500)
Subject: Fix various issues...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c527f7cb2fe7b92c05aac1333dee7649724cd984;p=thirdparty%2Ffreeradius-server.git

Fix various issues...
---

diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index 52d2bf7aff6..ac11c66114e 100644
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -183,9 +183,14 @@ DIAG_OFF(nonnull-compare)
  * This function wraps the assert but has nonnull-compare disabled
  * meaning a warning won't be emitted.
  */
-static inline fr_pair_nonnull_assert(fr_pair_t const *vp)
+static inline void fr_pair_nonnull_assert(fr_pair_t const *vp)
 {
-	fr_cond_assert(vp)
+	fr_cond_assert(vp);
+}
+
+static inline void fr_pair_list_nonnull_assert(fr_pair_list_t const *pair_list)
+{
+	fr_cond_assert(pair_list);
 }
 DIAG_ON(nonull-compare)
 
@@ -195,7 +200,7 @@ DIAG_ON(nonull-compare)
  *	so we can add some sneaky soft asserts.
  */
 #  define VP_VERIFY(_x)		fr_pair_nonnull_assert(_x)
-#  define LIST_VERIFY(_x)	fr_pair_nonnull_assert(_x)
+#  define LIST_VERIFY(_x)	fr_pair_list_nonnull_assert(_x)
 #endif
 
 /* Initialisation */