Slightly more efficient timer armed check

diff --git a/src/lib/util/timer.c b/src/lib/util/timer.c
index b38c55f470aba42c9b62b50f2bb0284f479c5515..07d70f61b2b736b8fcbb6a3f1fa11abe6b203f7b 100644 (file)
--- 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 824b23f32520f30d206882bed0340070041120ec..82aafc7084c650c52db495b37d8765295b3e5ad6 100644 (file)
--- 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);