From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 30 Aug 2016 08:41:07 +0000 (+0200)
Subject: dnsdist: Fix warnings when compiling with clang
X-Git-Tag: dnsdist-1.1.0-beta1~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4380%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Fix warnings when compiling with clang
---

diff --git a/pdns/bpf-filter.cc b/pdns/bpf-filter.cc
index 47a8234347..1b5b56a5ab 100644
--- a/pdns/bpf-filter.cc
+++ b/pdns/bpf-filter.cc
@@ -322,7 +322,7 @@ void BPFFilter::block(const DNSName& qname, uint16_t qtype)
 
 void BPFFilter::unblock(const DNSName& qname, uint16_t qtype)
 {
-  struct QNameKey key = { 0 };
+  struct QNameKey key = { { 0 } };
   std::string keyStr = qname.toDNSStringLC();
   (void) qtype;
 
@@ -397,8 +397,8 @@ std::vector<std::tuple<DNSName, uint16_t, uint64_t> > BPFFilter::getQNameStats()
   std::vector<std::tuple<DNSName, uint16_t, uint64_t> > result;
   std::unique_lock<std::mutex> lock(d_mutex);
 
-  struct QNameKey key = {0};
-  struct QNameKey nextKey = {0};
+  struct QNameKey key = { { 0 } };
+  struct QNameKey nextKey = { { 0 } };
   struct QNameValue value;
 
   int res = bpf_get_next_key(d_qnamemap.fd, &key, &nextKey);
diff --git a/pdns/dnscrypt.hh b/pdns/dnscrypt.hh
index ae4607f69d..f680dc4c5f 100644
--- a/pdns/dnscrypt.hh
+++ b/pdns/dnscrypt.hh
@@ -172,7 +172,6 @@ private:
   DnsCryptPrivateKey privateKey;
   unsigned char publicKey[DNSCRYPT_PUBLIC_KEY_SIZE];
   DnsCryptPrivateKey oldPrivateKey;
-  unsigned char oldPublicKey[DNSCRYPT_PUBLIC_KEY_SIZE];
   bool hasOldCert{false};
 };