From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 21 Nov 2018 17:32:28 +0000 (+0100)
Subject: misc -Wpedantic fixes
X-Git-Tag: v3.2.0~25^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=692ebfd96817120d5cee358526af92a6d200b5ea;p=thirdparty%2Fknot-resolver.git

misc -Wpedantic fixes
---

diff --git a/contrib/ccan/json/json.c b/contrib/ccan/json/json.c
index 4b58e1729..3fd3d4345 100644
--- 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 5182507e3..008eb0427 100644
--- 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 ce52a50a8..cc7f9b07c 100644
--- 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 10f7e1da7..74b3d349d 100644
--- 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 b2abee8c7..0009eefd2 100644
--- 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