From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 16 Sep 2021 12:45:02 +0000 (+0100)
Subject: v4: Two CI fixes (#4229)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cccdc6bedf23697572e2d98282bda8656a47fb8d;p=thirdparty%2Ffreeradius-server.git

v4: Two CI fixes (#4229)

* sysctl.h is deprecated on Linux - and not needed here

* Prevent invalid divide by zero warnings
---

diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c
index 944520ff6bf..8031c183a81 100644
--- a/src/lib/server/main_config.c
+++ b/src/lib/server/main_config.c
@@ -50,7 +50,6 @@ RCSID("$Id$")
 
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/sysctl.h>
 
 #ifdef HAVE_SYSLOG_H
 #  include <syslog.h>
diff --git a/src/lib/util/hw.c b/src/lib/util/hw.c
index 9603726ed55..3fe36e780f4 100644
--- a/src/lib/util/hw.c
+++ b/src/lib/util/hw.c
@@ -90,7 +90,11 @@ uint32_t fr_hw_num_cores_active(void)
                 fclose(cpu);
         }
 
-	return lcores / (tsibs / lcores);
+	/*
+	 *	Prevent clang scanner from warning about divide by zero
+	 */
+	tsibs = tsibs / (lcores ? lcores : 1);
+	return lcores / (tsibs ? tsibs : 1);
 }
 #else
 size_t fr_hw_cache_line_size(void)