Merge pull request #9662 from cmouse/patch-1604087167

Coverity fixes

diff --cc pdns/dbdnsseckeeper.cc
index 20e9d43d366ef2762d4bab200117433003eaf529,a318a36adae3fbca54227392458ac2181338e0c6..c8149f58f32303dd033782806be07ecbfddbd5ed
--- 1/pdns/dbdnsseckeeper.cc
--- 2/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@@ -117,14 -119,20 +117,15 @@@ bool DNSSECKeeper::addKey(const DNSName
  }
  
  void DNSSECKeeper::clearAllCaches() {
 -  {
 -    WriteLock l(&s_keycachelock);
 -    s_keycache.clear();
 -  }
 -  WriteLock l(&s_metacachelock);
 -  s_metacache.clear();
 +  s_keycache.write_lock()->clear();
 +  s_metacache.write_lock()->clear();
  }
  
- 
+ /* This function never fails, the return value is to simplify call chains
+    elsewhere so we can do mutate<cache> && clear<cache> */
  bool DNSSECKeeper::clearKeyCache(const DNSName& name)
  {
 -  WriteLock l(&s_keycachelock);
 -  s_keycache.erase(name);
 +  s_keycache.write_lock()->erase(name);
    return true;
  }
  

diff --cc pdns/stubresolver.cc
Simple merge