BIND 10 trac613, updated. 0de367c06c8e4c730729de446cc5c54b7cee9ea4 [trac613] suppress functionConst for resolver_cache.h, too.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Feb 28 20:17:01 UTC 2011
The branch, trac613 has been updated
via 0de367c06c8e4c730729de446cc5c54b7cee9ea4 (commit)
via a4a2b5aba9b2b16c4aa2cc8af01c19a4b9b61aea (commit)
via be8886364d3e7466a0a5007a75df797b6839004c (commit)
via 25747d9b65fccbe5e37b4c49377382381edf1e78 (commit)
from 09191932190ac8a64a4b77def3877fc5801d8aeb (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 0de367c06c8e4c730729de446cc5c54b7cee9ea4
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 28 12:15:58 2011 -0800
[trac613] suppress functionConst for resolver_cache.h, too.
it should have been necessary but apparently the check was skipped due to
the way we include header files.
commit a4a2b5aba9b2b16c4aa2cc8af01c19a4b9b61aea
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 28 12:13:58 2011 -0800
[trac613] Revert "[trac613] use <> instead of "" to include header files to satisfy cppcheck."
Based on the review comment. It was not clear why only these caused
missingInclude, but we now suppress it that doesn't matter anyway.
This reverts commit 59455cd6b9de13d63c2b6cf17eb7e8c88c8a99cc.
commit be8886364d3e7466a0a5007a75df797b6839004c
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 28 11:54:02 2011 -0800
[trac613] canceled the workaround change for 'selfassignment' in tests.
exclude these warnings in the suppress list instead.
also added some comments about the suppress list.
commit 25747d9b65fccbe5e37b4c49377382381edf1e78
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 28 11:33:23 2011 -0800
[trac613] added missingInclude to suppression list. it reportedly caused
false alarms on some systems.
-----------------------------------------------------------------------
Summary of changes:
src/cppcheck-suppress.lst | 13 ++++++++++++-
src/lib/cache/message_cache.cc | 2 ++
src/lib/cache/message_cache.h | 2 ++
src/lib/cache/resolver_cache.cc | 4 ++--
src/lib/cache/rrset_cache.cc | 2 ++
src/lib/cache/rrset_cache.h | 2 ++
src/lib/cache/tests/resolver_cache_unittest.cc | 2 +-
src/lib/dns/tests/name_unittest.cc | 7 +++----
src/lib/dns/tests/rdata_unittest.cc | 7 +++----
src/lib/dns/tests/tsigkey_unittest.cc | 7 +++----
.../nsas/tests/random_number_generator_unittest.cc | 2 +-
11 files changed, 33 insertions(+), 17 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/cppcheck-suppress.lst b/src/cppcheck-suppress.lst
index 1c8e20a..2c82b74 100644
--- a/src/cppcheck-suppress.lst
+++ b/src/cppcheck-suppress.lst
@@ -1,4 +1,15 @@
+// On some systems cppcheck produces false alarms about 'missing includes'.
+// the following two will suppress, depending on the cppcheck version
+debug
+missingInclude
+// This is a template, and should be excluded from the check
unreadVariable:src/lib/dns/rdata/template.cc:59
+// These two trigger warnings due to the incomplete implementation. This is
+// our problem, but we need to suppress the warnings for now.
+functionConst:src/lib/cache/resolver_cache.h
functionConst:src/lib/cache/message_cache.h
functionConst:src/lib/cache/rrset_cache.h
-debug
+// Intentional self assignment tests. Suppress warning about them.
+selfAssignment:src/lib/dns/tests/name_unittest.cc:292
+selfAssignment:src/lib/dns/tests/rdata_unittest.cc:227
+selfAssignment:src/lib/dns/tests/tsigkey_unittest.cc:104
diff --git a/src/lib/cache/message_cache.cc b/src/lib/cache/message_cache.cc
index 3f2c37a..9b74c2a 100644
--- a/src/lib/cache/message_cache.cc
+++ b/src/lib/cache/message_cache.cc
@@ -75,6 +75,7 @@ MessageCache::update(const Message& msg) {
return (message_table_.add(msg_entry, entry_key, true));
}
+#if 0
void
MessageCache::dump(const std::string&) {
//TODO
@@ -90,6 +91,7 @@ MessageCache::resize(uint32_t) {
//TODO
return (true);
}
+#endif
} // namespace cache
} // namespace isc
diff --git a/src/lib/cache/message_cache.h b/src/lib/cache/message_cache.h
index 3a684c8..ef0d16d 100644
--- a/src/lib/cache/message_cache.h
+++ b/src/lib/cache/message_cache.h
@@ -57,6 +57,7 @@ public:
/// directly.
bool update(const isc::dns::Message& msg);
+#if 0
/// \brief Dump the message cache to specified file.
/// \todo It should can be dumped to one configured database.
void dump(const std::string& file_name);
@@ -67,6 +68,7 @@ public:
/// \brief Resize the size of message cache in runtime.
bool resize(uint32_t size);
+#endif
protected:
/// \brief Get the hash key for the message entry in the cache.
diff --git a/src/lib/cache/resolver_cache.cc b/src/lib/cache/resolver_cache.cc
index 6a7bc1d..0734da8 100644
--- a/src/lib/cache/resolver_cache.cc
+++ b/src/lib/cache/resolver_cache.cc
@@ -14,8 +14,8 @@
#include <config.h>
-#include <cache/resolver_cache.h>
-#include <dns/message.h>
+#include "resolver_cache.h"
+#include "dns/message.h"
#include "rrset_cache.h"
#include <string>
#include <algorithm>
diff --git a/src/lib/cache/rrset_cache.cc b/src/lib/cache/rrset_cache.cc
index 0a2957c..7dab3b5 100644
--- a/src/lib/cache/rrset_cache.cc
+++ b/src/lib/cache/rrset_cache.cc
@@ -83,6 +83,7 @@ RRsetCache::update(const isc::dns::RRset& rrset, const RRsetTrustLevel& level) {
}
}
+#if 0
void
RRsetCache::dump(const std::string&) {
//TODO
@@ -98,6 +99,7 @@ RRsetCache::resize(uint32_t) {
//TODO
return (true);
}
+#endif
} // namespace cache
} // namespace isc
diff --git a/src/lib/cache/rrset_cache.h b/src/lib/cache/rrset_cache.h
index 15084c9..9453f85 100644
--- a/src/lib/cache/rrset_cache.h
+++ b/src/lib/cache/rrset_cache.h
@@ -70,6 +70,7 @@ public:
RRsetEntryPtr update(const isc::dns::RRset& rrset,
const RRsetTrustLevel& level);
+#if 0
/// \brief Dump the rrset cache to specified file.
///
/// \param file_name The file to write to
@@ -89,6 +90,7 @@ public:
/// \param The size to resize to
/// \return true
bool resize(uint32_t size);
+#endif
private:
uint16_t class_; // The class of the rrset cache.
diff --git a/src/lib/cache/tests/resolver_cache_unittest.cc b/src/lib/cache/tests/resolver_cache_unittest.cc
index 5767550..20dcec9 100644
--- a/src/lib/cache/tests/resolver_cache_unittest.cc
+++ b/src/lib/cache/tests/resolver_cache_unittest.cc
@@ -16,7 +16,7 @@
#include <string>
#include <gtest/gtest.h>
#include <dns/rrset.h>
-#include <cache/resolver_cache.h>
+#include "resolver_cache.h"
#include "cache_test_messagefromfile.h"
#include "cache_test_sectioncount.h"
diff --git a/src/lib/dns/tests/name_unittest.cc b/src/lib/dns/tests/name_unittest.cc
index e6abaf6..5daba9c 100644
--- a/src/lib/dns/tests/name_unittest.cc
+++ b/src/lib/dns/tests/name_unittest.cc
@@ -288,10 +288,9 @@ TEST_F(NameTest, assignment) {
delete copy2;
EXPECT_EQ(copy3, example_name);
- // Self assignment (via a reference to silence cppcheck)
- Name& copyref(copy);
- copyref = copy;
- EXPECT_EQ(example_name, copyref);
+ // Self assignment
+ copy = copy;
+ EXPECT_EQ(example_name, copy);
}
TEST_F(NameTest, toText) {
diff --git a/src/lib/dns/tests/rdata_unittest.cc b/src/lib/dns/tests/rdata_unittest.cc
index 97644f1..5ce4c03 100644
--- a/src/lib/dns/tests/rdata_unittest.cc
+++ b/src/lib/dns/tests/rdata_unittest.cc
@@ -223,10 +223,9 @@ TEST_F(Rdata_Unknown_Test, assignment) {
delete copy2;
EXPECT_EQ(0, copy3.compare(rdata_unknown));
- // Self assignment (via a reference to silence cppcheck)
- generic::Generic& copyref(copy);
- copyref = copy;
- EXPECT_EQ(0, copyref.compare(rdata_unknown));
+ // Self assignment
+ copy = copy;
+ EXPECT_EQ(0, copy.compare(rdata_unknown));
}
TEST_F(Rdata_Unknown_Test, toText) {
diff --git a/src/lib/dns/tests/tsigkey_unittest.cc b/src/lib/dns/tests/tsigkey_unittest.cc
index 1745b92..6b2b8c5 100644
--- a/src/lib/dns/tests/tsigkey_unittest.cc
+++ b/src/lib/dns/tests/tsigkey_unittest.cc
@@ -100,10 +100,9 @@ TEST_F(TSIGKeyTest, assignment) {
delete copy2;
compareTSIGKeys(original, copy3);
- // self assignment (via a reference to silence cppcheck)
- TSIGKey& copyref(copy);
- copyref = copy;
- compareTSIGKeys(original, copyref);
+ // self assignment
+ copy = copy;
+ compareTSIGKeys(original, copy);
}
class TSIGKeyRingTest : public ::testing::Test {
diff --git a/src/lib/nsas/tests/random_number_generator_unittest.cc b/src/lib/nsas/tests/random_number_generator_unittest.cc
index ee48555..c306b09 100644
--- a/src/lib/nsas/tests/random_number_generator_unittest.cc
+++ b/src/lib/nsas/tests/random_number_generator_unittest.cc
@@ -21,7 +21,7 @@
#include <iostream>
#include <vector>
-#include <nsas/random_number_generator.h>
+#include "random_number_generator.h"
namespace isc {
namespace nsas {
More information about the bind10-changes
mailing list