From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 6 Jul 2017 20:00:16 +0000 (-0400)
Subject: Convert file descriptor and event timer comparators to something less branchy
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b72efaaa99993583b8a06ae039bd405c84e4ae93;p=thirdparty%2Ffreeradius-server.git

Convert file descriptor and event timer comparators to something less branchy
---

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index e032be53dca..b733c69b10d 100644
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -151,16 +151,13 @@ struct fr_event_list_t {
  */
 static int fr_event_timer_cmp(void const *a, void const *b)
 {
-	fr_event_timer_t const *ev_a = a;
-	fr_event_timer_t const *ev_b = b;
+	int			ret;
+	fr_event_timer_t const	*ev_a = a;
+	fr_event_timer_t const	*ev_b = b;
 
-	if (ev_a->when.tv_sec < ev_b->when.tv_sec) return -1;
-	if (ev_a->when.tv_sec > ev_b->when.tv_sec) return +1;
-
-	if (ev_a->when.tv_usec < ev_b->when.tv_usec) return -1;
-	if (ev_a->when.tv_usec > ev_b->when.tv_usec) return +1;
-
-	return 0;
+	return (ret = ((ev_a->when.tv_sec < ev_b->when.tv_sec) - (ev_a->when.tv_sec > ev_b->when.tv_sec))) ?
+	        ret :
+	       (ev_a->when.tv_usec < ev_b->when.tv_usec) - (ev_a->when.tv_usec > ev_b->when.tv_usec);
 }
 
 /** Compare two file descriptor handles
@@ -177,10 +174,7 @@ static int fr_event_fd_cmp(void const *a, void const *b)
 	fr_event_fd_t const *ev_a = a;
 	fr_event_fd_t const *ev_b = b;
 
-	if (ev_a->fd < ev_b->fd) return -1;
-	if (ev_a->fd > ev_b->fd) return +1;
-
-	return 0;
+	return (ev_a->fd < ev_b->fd) - (ev_a->fd > ev_b->fd);
 }
 
 /** Return the number of file descriptors is_registered with this event loop