From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 22 Apr 2025 18:35:32 +0000 (-0500)
Subject: Slightly more efficient timer armed check
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb922711c8efdced338446d733fd96497f308b20;p=thirdparty%2Ffreeradius-server.git

Slightly more efficient timer armed check
---

diff --git a/src/lib/util/timer.c b/src/lib/util/timer.c
index b38c55f470a..07d70f61b2b 100644
--- a/src/lib/util/timer.c
+++ b/src/lib/util/timer.c
@@ -675,9 +675,9 @@ fr_time_t fr_timer_when(fr_timer_t *ev)
  *	- true if the event is armed.
  *	- false if the event is not armed.
  */
-bool fr_timer_armed(fr_timer_t *ev)
+bool _fr_timer_armed(fr_timer_t *ev)
 {
-	return ev && EVENT_ARMED(ev);
+	return EVENT_ARMED(ev);
 }
 
 /** Run all scheduled timer events in a lst
diff --git a/src/lib/util/timer.h b/src/lib/util/timer.h
index 824b23f3252..82aafc7084c 100644
--- a/src/lib/util/timer.h
+++ b/src/lib/util/timer.h
@@ -91,7 +91,10 @@ int			fr_timer_delete(fr_timer_t **ev_p) CC_HINT(nonnull);	/* disarms AND frees
 
 fr_time_t		fr_timer_when(fr_timer_t *ev) CC_HINT(nonnull);
 
-bool			fr_timer_armed(fr_timer_t *ev);
+bool			_fr_timer_armed(fr_timer_t *ev);
+
+/* Wrapper to avoid overhead of function call on NULL */
+#define			fr_timer_armed(_ev) ((_ev) && _fr_timer_armed(_ev))	/* returns true if the timer is armed */
 
 int			fr_timer_list_run(fr_timer_list_t *tl, fr_time_t *when) CC_HINT(nonnull);