[master] fix return value for strict compiler checks

also fixed a trivial typo in a unit test

diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index e0af93fd4d6bdfe7c52d34d87200c7a02d3202a5..8e834cb7479cff5b25d00a71cea8fb024e9fe474 100644 (file)
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -267,6 +267,9 @@ ZoneData::getClosestNSEC(RBTreeNodeChain<Domain>& node_path,
     // This must be impossible and should be an internal bug.
     // See the description at the method declaration.
     assert(false);
+    // Even though there is an assert here, strict compilers
+    // will still need some return value.
+    return (ConstRBNodeRRsetPtr());
 }
 
 /// Maintain intermediate data specific to the search context used in

diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index b3e76016e7a6d9978c81ef9000331d797488c979..4fc35e1ecfe93367cc1368f46aeb2629d85b8c1b 100644 (file)
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -1074,7 +1074,7 @@ TEST_F(InMemoryZoneFinderTest, find) {
     findCheck();
 }
 
-TEST_F(InMemoryZoneFinderTest, findNSEC3Signe) {
+TEST_F(InMemoryZoneFinderTest, findNSEC3Signed) {
     findCheck(ZoneFinder::RESULT_NSEC3_SIGNED);
 }