Teach scanbuild that two divisions are safe: one by adding an assert, one by using...

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index c696a767031dec95e8da715cafdd5dcd1de26182..4dd6bcb73b0414058f0557acfd0febe7241e8066 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2406,6 +2406,7 @@ static unsigned int getWorkerLoad(size_t workerIdx)
 
 static unsigned int selectWorker(unsigned int hash)
 {
+  assert(RecThreadInfo::numWorkers() != 0);
   if (g_balancingFactor == 0) {
     return RecThreadInfo::numHandlers() + RecThreadInfo::numDistributors() + (hash % RecThreadInfo::numWorkers());
   }

diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc
index d1319a1a4227e88125de9a5b3301691864c85dc3..5e4623a007b8ef6ec8d7e1bd0fb385b3c613771c 100644 (file)
--- a/pdns/sillyrecords.cc
+++ b/pdns/sillyrecords.cc
@@ -13,8 +13,8 @@
 #include <errno.h>
 #include "dnsrecords.hh"
 
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-                                 1000000,10000000,100000000,1000000000};
+const static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
+  1000000,10000000,100000000,1000000000};
 
 /* converts ascii size/precision X * 10**Y(cm) to 0xXY. moves pointer.*/
 static uint8_t precsize_aton(const char **strptr)