defer: fix/hide tidy/trivial_checks warnings

diff --git a/.clang-tidy b/.clang-tidy
index 4d77c1a7d25dfa6b3f914ddd2af3a2705f0d3a34..32816a96a49875041ff24c00464bc3178880bbcc 100644 (file)
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -16,6 +16,7 @@ Checks: |-
   -bugprone-sizeof-expression,
   -bugprone-suspicious-string-compare,
   -cert-dcl03-c,
+  -cert-dcl16-c,
   -clang-analyzer-deadcode.DeadStores,
   -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
   -clang-analyzer-unix.Malloc,
@@ -37,6 +38,7 @@ Checks: |-
   -readability-magic-numbers,
   -readability-non-const-parameter,
   -readability-redundant-declaration,
+  -readability-uppercase-literal-suffix,
   -clang-analyzer-core.UndefinedBinaryOperatorResult
 
 # TODO: remove `-clang-analyzer-core.UndefinedBinaryOperatorResult` when we

diff --git a/ci/no_assert_check.sh b/ci/no_assert_check.sh
index 610011a103cfd3b34d1569313e43bc182f3b59ff..4bb7ccfcd214541f0df79d32f8f8dd29ebdd0ac9 100755 (executable)
--- a/ci/no_assert_check.sh
+++ b/ci/no_assert_check.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-grep '\<assert\>' -- $(git ls-files | grep '\.[hc]$' | grep -vE '^(contrib|bench|tests|daemon/rrl)/')
+grep '\<assert\>' -- $(git ls-files | grep '\.[hc]$' | grep -vE '^(contrib|bench|tests|daemon/ratelimiting.test|lib/kru)/')
 test $? -eq 1

diff --git a/contrib/meson.build b/contrib/meson.build
index 5d97e8891a4600e26ebb4a33ae1d2bc9c63e491a..e7dccae972d076bba5967dc29fe54c18b461a859 100644 (file)
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -10,7 +10,8 @@ contrib_src = files([
   'murmurhash3/murmurhash3.c',
   'base32hex.c',
   'base64.c',
-  'base64url.c'
+  'base64url.c',
+  'openbsd/siphash.c',
 ])
 
 contrib_inc = include_directories('.', '..')

diff --git a/daemon/defer.c b/daemon/defer.c
index 89d792652bf49d926b61d812b8372c6943788323..1908f478f6ffcb0b45613d43324d01329112044c 100644 (file)
--- a/daemon/defer.c
+++ b/daemon/defer.c
@@ -21,7 +21,8 @@
 
 #define KRU_CAPACITY  (1<<10)
 #define MAX_DECAY     (KRU_LIMIT * 0.0006929)  // -> halving counters in 1s
-#define TIME_MULT     1/1   // max fraction of rate limit filled by one cpu (multiplies large int)
+#define TIME_MULT     1/1   // NOLINT for now, TODO improve readability
+       // max fraction of rate limit filled by one cpu (multiplies large int)
        // TODO divide by #cpus?
 
 #define REQ_TIMEOUT        5000000 // ns (THREAD_CPUTIME), older deferred queries are dropped

diff --git a/lib/meson.build b/lib/meson.build
index 9f611e3a95c8784bcd4e9ba5bef0713757f69d28..e369a4526956cff21ecec9f29f5e9034fc68f04f 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -40,7 +40,6 @@ libkres_src = files([
   'selection_iter.c',
   'utils.c',
   'zonecut.c',
-  '../contrib/openbsd/siphash.c', # needed for kru
 ])
 c_src_lint += libkres_src