From: W.C.A. Wijngaards Date: Fri, 27 Nov 2020 09:01:55 +0000 (+0100) Subject: - Fix compile warnings for windows. X-Git-Tag: release-1.13.0rc3~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67d541d6909149a2de5e671292617bc5517bf867;p=thirdparty%2Funbound.git - Fix compile warnings for windows. --- diff --git a/doc/Changelog b/doc/Changelog index 9de0334de..c4fbe4544 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 27 November 2020: Wouter - Fix compile warning for type cast in http2_submit_dns_response. - Fix when use free buffer to initialize rbtree for stream reuse. + - Fix compile warnings for windows. 26 November 2020: Wouter - Fix to omit UDP receive errors from log, if verbosity low. diff --git a/services/outside_network.c b/services/outside_network.c index c26b83cc3..2ced272b7 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -335,8 +335,8 @@ log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse) if(verbosity < v) return; addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf)); port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port); - verbose(v, "%s %s#%u 0x%llx fd %d", msg, addrbuf, (unsigned)port, - (unsigned long long)reuse, reuse->pending->c->fd); + verbose(v, "%s %s#%u fd %d", msg, addrbuf, (unsigned)port, + reuse->pending->c->fd); } /** pop the first element from the writewait list */ @@ -467,7 +467,7 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr, key_p.reuse.node.key = &key_p.reuse; if(use_ssl) key_p.reuse.is_ssl = 1; - if(addrlen > sizeof(key_p.reuse.addr)) + if(addrlen > (socklen_t)sizeof(key_p.reuse.addr)) return NULL; memmove(&key_p.reuse.addr, addr, addrlen); key_p.reuse.addrlen = addrlen;