nitpick fixes for clang-tidy

diff --git a/daemon/bindings/cache.c b/daemon/bindings/cache.c
index 1206799838e02b2c5b85f3cd3784a28c6c526f1d..5e780ecf683423da0a3e3035c0794c85f315f93a 100644 (file)
--- a/daemon/bindings/cache.c
+++ b/daemon/bindings/cache.c
@@ -174,7 +174,7 @@ static int cache_open(lua_State *L)
        /* Select cache storage backend */
        struct engine *engine = engine_luaget(L);
 
-       lua_Number csize_lua = lua_tointeger(L, 1);
+       lua_Integer csize_lua = lua_tointeger(L, 1);
        if (!(csize_lua >= 8192 && csize_lua < SIZE_MAX)) { /* min. is basically arbitrary */
                lua_error_p(L, "invalid cache size specified, it must be in range <8192, "
                                STR(SIZE_MAX)  ">");

diff --git a/daemon/ffimodule.c b/daemon/ffimodule.c
index 02102bb2e147b6301a65fc739cd9e209a837193d..7e8424d22259345c70ba47b699481ca195e3c52f 100644 (file)
--- a/daemon/ffimodule.c
+++ b/daemon/ffimodule.c
@@ -136,12 +136,12 @@ static int l_ffi_deinit(struct kr_module *module)
 #define LAYER_FFI_CALL(ctx, slot_name) \
        const int *cb_slot = (ctx)->api->cb_slots + SLOT_ ## slot_name; \
        if (*cb_slot <= 0) { \
-               return ctx->state; \
+               return (ctx)->state; \
        } \
        struct kr_module *module = (ctx)->api->data; \
        lua_State *L = module->lib; \
        lua_rawgeti(L, LUA_REGISTRYINDEX, *cb_slot); \
-       lua_pushnumber(L, ctx->state)
+       lua_pushnumber(L, (ctx)->state)
 
 static int l_ffi_layer_begin(kr_layer_t *ctx)
 {

diff --git a/daemon/io.c b/daemon/io.c
index f183d3471e142436db504850cd7ce88d43d7d7a1..da4e1dae014ca71b2d127db44ca6cb5b2aac068b 100644 (file)
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -27,10 +27,10 @@
 #include "daemon/session.h"
 
 #define negotiate_bufsize(func, handle, bufsize_want) do { \
-    int bufsize = 0; func(handle, &bufsize); \
-       if (bufsize < bufsize_want) { \
-               bufsize = bufsize_want; \
-               func(handle, &bufsize); \
+    int bufsize = 0; (func)((handle), &bufsize); \
+       if (bufsize < (bufsize_want)) { \
+               bufsize = (bufsize_want); \
+               (func)((handle), &bufsize); \
        } \
 } while (0)
 

diff --git a/daemon/main.c b/daemon/main.c
index 635f56b677fd13ea75183429d7bcf37211d41b4d..ec9ae339e0798ee38b419f7b6a7bfd482944aa7f 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -635,7 +635,7 @@ static int bind_sockets(struct network *net, addr_array_t *addr_set, bool tls) {
                char buf[INET6_ADDRSTRLEN + 1];
                const char *addr = kr_straddr_split(addr_set->at[i], buf, &port);
                /* NULL will result into kr_strerror(EINVAL) -> correct. */
-               int ret = network_listen(net, addr, (uint16_t)port, flags);
+               int ret = network_listen(net, addr, port, flags);
                if (ret != 0) {
                        kr_log_error("[system] bind to '%s@%d' %s%s\n",
                                addr, port, tls ? "(TLS) " : "", kr_strerror(ret));

diff --git a/daemon/network.c b/daemon/network.c
index 6a148bb168bd8324be6e86301877d27b351f7be9..5a47ad8038a70a078872a27bb31811844212f1a4 100644 (file)
--- a/daemon/network.c
+++ b/daemon/network.c
@@ -373,7 +373,7 @@ static int set_bpf_cb(const char *key, void *val, void *ext)
        assert(bpffd != NULL);
 
        for (size_t i = 0; i < endpoints->len; i++) {
-               struct endpoint *endpoint = (struct endpoint *)endpoints->at[i];
+               struct endpoint *endpoint = endpoints->at[i];
                uv_os_fd_t sockfd = -1;
                if (endpoint->tcp != NULL) uv_fileno((const uv_handle_t *)endpoint->tcp, &sockfd);
                if (endpoint->udp != NULL) uv_fileno((const uv_handle_t *)endpoint->udp, &sockfd);
@@ -415,7 +415,7 @@ static int clear_bpf_cb(const char *key, void *val, void *ext)
        assert(endpoints != NULL);
 
        for (size_t i = 0; i < endpoints->len; i++) {
-               struct endpoint *endpoint = (struct endpoint *)endpoints->at[i];
+               struct endpoint *endpoint = endpoints->at[i];
                uv_os_fd_t sockfd = -1;
                if (endpoint->tcp != NULL) uv_fileno((const uv_handle_t *)endpoint->tcp, &sockfd);
                if (endpoint->udp != NULL) uv_fileno((const uv_handle_t *)endpoint->udp, &sockfd);

diff --git a/daemon/tls.c b/daemon/tls.c
index fd7fac51a054148bd52d1b7656da7563013575d2..89a5f02cc43e3e80632104b67e0425bb9e348247 100644 (file)
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -36,7 +36,7 @@
 #include "daemon/worker.h"
 #include "daemon/session.h"
 
-#define EPHEMERAL_CERT_EXPIRATION_SECONDS_RENEW_BEFORE 60*60*24*7
+#define EPHEMERAL_CERT_EXPIRATION_SECONDS_RENEW_BEFORE (60*60*24*7)
 #define GNUTLS_PIN_MIN_VERSION  0x030400
 
 /** @internal Debugging facility. */
@@ -548,7 +548,7 @@ ssize_t tls_process_input_data(struct session *s, const uint8_t *buf, ssize_t nr
   DNS-over-TLS OOB key-pins: https://tools.ietf.org/html/rfc7858#appendix-A
   HPKP pin reference:        https://tools.ietf.org/html/rfc7469#appendix-A
 */
-#define PINLEN  (((32) * 8 + 4)/6) + 3 + 1
+#define PINLEN  ((((32) * 8 + 4)/6) + 3 + 1)
 
 /* out must be at least PINLEN octets long */
 static int get_oob_key_pin(gnutls_x509_crt_t crt, char *outchar, ssize_t outchar_len)

diff --git a/daemon/tls_ephemeral_credentials.c b/daemon/tls_ephemeral_credentials.c
index a305eb18ef847679bfaa044c41bb807bcb5f64b1..84e3123f2af23da9b57745d38ba1073a2d9fc216 100644 (file)
--- a/daemon/tls_ephemeral_credentials.c
+++ b/daemon/tls_ephemeral_credentials.c
@@ -29,7 +29,7 @@
 
 #define EPHEMERAL_PRIVKEY_FILENAME "ephemeral_key.pem"
 #define INVALID_HOSTNAME "dns-over-tls.invalid"
-#define EPHEMERAL_CERT_EXPIRATION_SECONDS 60*60*24*90
+#define EPHEMERAL_CERT_EXPIRATION_SECONDS (60*60*24*90)
 
 /* This is an attempt to grab an exclusive, advisory, non-blocking
  * lock based on a filename.  At the moment it's POSIX-only, but it

diff --git a/daemon/worker.c b/daemon/worker.c
index f9b361f89573296c1fee9f95050594bb4b387a99..74ed644c86744272fdac0115b6b51eae0130609c 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -97,7 +97,7 @@ struct qr_task
 #define qr_task_ref(task) \
        do { ++(task)->refs; } while(0)
 #define qr_task_unref(task) \
-       do { if (task && --(task)->refs == 0) { qr_task_free(task); } } while (0)
+       do { if ((task) && --(task)->refs == 0) { qr_task_free((task)); } } while (0)
 
 /** @internal get key for tcp session
  *  @note kr_straddr() return pointer to static string

diff --git a/lib/generic/trie.c b/lib/generic/trie.c
index 0009eefd275c8d27b7ecceef2eed50d9dd2a225b..41e9acc1a6f340b5484b7ad1e71e790cf1bed440 100644 (file)
--- a/lib/generic/trie.c
+++ b/lib/generic/trie.c
@@ -216,8 +216,8 @@ static node_t* twig(node_t *t, uint i)
  * Having this separate might be meaningful for performance optimization.
  */
 #define TWIGOFFMAX(off, max, t, b) do {                        \
-               off = twigoff(t, b);                    \
-               max = bitmap_weight(t->branch.bitmap);  \
+               (off) = twigoff((t), (b));              \
+               (max) = bitmap_weight((t)->branch.bitmap);\
        } while(0)
 
 /*! \brief Simple string comparator. */

diff --git a/lib/resolve.c b/lib/resolve.c
index 8718f252e5aff5f6ba306acfb235cece5569991e..97dbb8328cf53a6dec57015a465b1c6988223043 100644 (file)
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -1547,7 +1547,7 @@ int kr_resolve_checkout(struct kr_request *request, const struct sockaddr *src,
        }
 
        /* Randomize query case (if secret changed) */
-       knot_dname_t *qname = (knot_dname_t *)knot_pkt_qname(packet);
+       knot_dname_t *qname = knot_pkt_qname(packet);
        if (qry->secret != old_minimization_secret) {
                randomized_qname_case(qname, qry->secret);
        }

diff --git a/lib/rplan.c b/lib/rplan.c
index f07dc39332b72434dd189dd4dd50bb9cc4218ed2..3a177c0c7a244ac24a83701eaa8026f71e1da5b1 100644 (file)
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -24,8 +24,6 @@
 #include "lib/layer.h"
 
 #define VERBOSE_MSG(qry, ...) QRVERBOSE(qry, "plan",  __VA_ARGS__)
-#define QUERY_PROVIDES(q, name, cls, type) \
-    ((q)->sclass == (cls) && (q)->stype == type && knot_dname_is_equal((q)->sname, name))
 
 inline static unsigned char chars_or(const unsigned char a, const unsigned char b)
 {
@@ -269,7 +267,8 @@ int kr_rplan_pop(struct kr_rplan *rplan, struct kr_query *qry)
 bool kr_rplan_satisfies(struct kr_query *closure, const knot_dname_t *name, uint16_t cls, uint16_t type)
 {
        while (name && closure) {
-               if (QUERY_PROVIDES(closure, name, cls, type)) {
+               if (closure->sclass == cls && closure->stype == type
+                   && knot_dname_is_equal(closure->sname, name)) {
                        return true;
                }
                closure = closure->parent;

diff --git a/modules/hints/hints.c b/modules/hints/hints.c
index ecd663c4ebe98fbf9a1c263f36fef5c74bc65d15..1f154ae7ff2eed3a308d7b9f3ef6a1ce470582a3 100644 (file)
--- a/modules/hints/hints.c
+++ b/modules/hints/hints.c
@@ -585,7 +585,7 @@ static char* hint_ttl(void *env, struct kr_module *module, const char *args)
        JsonNode *root_node = args ? json_decode(args) : NULL;
        if (root_node && root_node->tag == JSON_NUMBER) {
                double ttl_d = root_node->number_;
-               uint32_t ttl = round(ttl_d);
+               uint32_t ttl = (uint32_t)round(ttl_d);
                if (ttl_d >= 0 && fabs(ttl_d - ttl) * 64 < 1) {
                        data->ttl = ttl;
                }