misc -Wpedantic fixes

diff --git a/contrib/ccan/json/json.c b/contrib/ccan/json/json.c
index 4b58e1729aeeb8e537336e040e11ccf1917da08f..3fd3d4345067aca8c125d5d5d8b4c9b3d67f4d5f 100644 (file)
--- a/contrib/ccan/json/json.c
+++ b/contrib/ccan/json/json.c
@@ -1172,9 +1172,9 @@ void emit_string(SB *out, const char *str)
                                                strcpy(b, "\\uFFFD");
                                                b += 6;
                                        } else {
-                                               *b++ = 0xEF;
-                                               *b++ = 0xBF;
-                                               *b++ = 0xBD;
+                                               *b++ = (char)0xEF;
+                                               *b++ = (char)0xBF;
+                                               *b++ = (char)0xBD;
                                        }
                                        s++;
                                } else if (c < 0x1F || (c >= 0x80 && escape_unicode)) {

diff --git a/daemon/tls.c b/daemon/tls.c
index 5182507e3a4ca749046c851544057ef07a1bb919..008eb042707579fcc3d15054c66cb9bd80a0add5 100644 (file)
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -49,7 +49,7 @@
 struct async_write_ctx {
        uv_write_t write_req;
        struct tls_common_ctx *t;
-       char buf[0];
+       char buf[];
 };
 
 static char const server_logstring[] = "tls";
@@ -731,7 +731,7 @@ void tls_credentials_free(struct tls_credentials *tls_credentials) {
 
 static int client_paramlist_entry_free(struct tls_client_paramlist_entry *entry)
 {
-       DEBUG_MSG("freeing TLS parameters %p\n", entry);
+       DEBUG_MSG("freeing TLS parameters %p\n", (void *)entry);
 
        while (entry->ca_files.len > 0) {
                if (entry->ca_files.at[0] != NULL) {

diff --git a/daemon/worker.c b/daemon/worker.c
index ce52a50a8fe26afa198772937feb509137670b02..cc7f9b07cc78d571fdbe666dd7d4241dd184e12a 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1717,7 +1717,7 @@ int worker_task_finalize(struct qr_task *task, int state)
 
 void worker_task_complete(struct qr_task *task)
 {
-       return qr_task_complete(task);
+       qr_task_complete(task);
 }
 
 void worker_task_ref(struct qr_task *task)

diff --git a/lib/cache/nsec1.c b/lib/cache/nsec1.c
index 10f7e1da7b1cdc54ad09e384efab55134d33bfa4..74b3d349d07c9011ee297446ea1c27ef3644bcd9 100644 (file)
--- a/lib/cache/nsec1.c
+++ b/lib/cache/nsec1.c
@@ -256,7 +256,7 @@ static const char * find_leq_NSEC1(struct kr_cache *cache, const struct kr_query
        };
        assert((ssize_t)(kwz_sname.len) >= 0);
        bool covers = /* we know for sure that the low end is before kwz_sname */
-               3 == kwz_between((knot_db_val_t){}, kwz_sname, kwz_hi);
+               3 == kwz_between((knot_db_val_t){ NULL, 0 }, kwz_sname, kwz_hi);
        if (!covers) {
                return "range search miss (!covers)";
        }

diff --git a/lib/generic/trie.c b/lib/generic/trie.c
index b2abee8c78643ad1c14c65f746372d692385676b..0009eefd275c8d27b7ecceef2eed50d9dd2a225b 100644 (file)
--- a/lib/generic/trie.c
+++ b/lib/generic/trie.c
@@ -129,7 +129,7 @@ static inline void empty_root(node_t *root) {
 static void assert_portability(void) {
 #if FLAGS_HACK
        assert(((union node){ .leaf = {
-                       .key = ((void *)NULL) + 1,
+                       .key = (tkey_t *)(((uint8_t *)NULL) + 1),
                        .val = NULL
                } }).branch.flags == 1);
 #endif