BIND 10 master, updated. 82cf8a980ba6ec9f7df3fc80703bb5988640cd99 [master] fix return value for strict compiler checks

BIND 10 source code commits bind10-changes at lists.isc.org
Fri May 11 14:30:35 UTC 2012


The branch, master has been updated
       via  82cf8a980ba6ec9f7df3fc80703bb5988640cd99 (commit)
      from  7b053b086b440f13275474f704c5ff7cce0d8cfa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 82cf8a980ba6ec9f7df3fc80703bb5988640cd99
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri May 11 16:30:15 2012 +0200

    [master] fix return value for strict compiler checks
    
    also fixed a trivial typo in a unit test

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/memory_datasrc.cc                |    3 +++
 src/lib/datasrc/tests/memory_datasrc_unittest.cc |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index e0af93f..8e834cb 100644
--- 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 b3e7601..4fc35e1 100644
--- 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);
 }
 



More information about the bind10-changes mailing list