BIND 10 trac3173, updated. e898091a969a7f4d6481be297d1af3676480069a [3173] Fixed cppcheck errors in perfdhcp.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Sep 23 13:47:59 UTC 2013
The branch, trac3173 has been updated
via e898091a969a7f4d6481be297d1af3676480069a (commit)
from 82a00e6ef79987b9de80c0b63950a8389592b3dc (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 e898091a969a7f4d6481be297d1af3676480069a
Author: Marcin Siodelski <marcin at isc.org>
Date: Mon Sep 23 15:47:48 2013 +0200
[3173] Fixed cppcheck errors in perfdhcp.
-----------------------------------------------------------------------
Summary of changes:
tests/tools/perfdhcp/command_options.cc | 4 ++--
tests/tools/perfdhcp/stats_mgr.h | 6 +++---
tests/tools/perfdhcp/test_control.cc | 10 +++++-----
.../tools/perfdhcp/tests/command_options_helper.h | 2 +-
tests/tools/perfdhcp/tests/stats_mgr_unittest.cc | 1 -
.../tools/perfdhcp/tests/test_control_unittest.cc | 2 +-
6 files changed, 12 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/command_options.cc b/tests/tools/perfdhcp/command_options.cc
index 64de43d..7df1ea4 100644
--- a/tests/tools/perfdhcp/command_options.cc
+++ b/tests/tools/perfdhcp/command_options.cc
@@ -500,7 +500,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
// If DUID is not specified from command line we need to
// generate one.
- if (duid_template_.size() == 0) {
+ if (duid_template_.empty()) {
generateDuidTemplate();
}
return (false);
@@ -568,9 +568,9 @@ CommandOptions::decodeMac(const std::string& base) {
mac_template_.clear();
// Get pieces of MAC address separated with : (or even ::)
while (std::getline(s1, token, ':')) {
- unsigned int ui = 0;
// Convert token to byte value using std::istringstream
if (token.length() > 0) {
+ unsigned int ui = 0;
try {
// Do actual conversion
ui = convertHexString(token);
diff --git a/tests/tools/perfdhcp/stats_mgr.h b/tests/tools/perfdhcp/stats_mgr.h
index a8b5d98..586d8e0 100644
--- a/tests/tools/perfdhcp/stats_mgr.h
+++ b/tests/tools/perfdhcp/stats_mgr.h
@@ -1183,7 +1183,7 @@ public:
/// \throw isc::InvalidOperation if no exchange type added to
/// track statistics.
void printStats() const {
- if (exchanges_.size() == 0) {
+ if (exchanges_.empty()) {
isc_throw(isc::InvalidOperation,
"no exchange type added for tracking");
}
@@ -1238,7 +1238,7 @@ public:
/// \throw isc::InvalidOperation if no exchange type added to
/// track statistics or packets archive mode is disabled.
void printTimestamps() const {
- if (exchanges_.size() == 0) {
+ if (exchanges_.empty()) {
isc_throw(isc::InvalidOperation,
"no exchange type added for tracking");
}
@@ -1261,7 +1261,7 @@ public:
///
/// \throw isc::InvalidOperation if no custom counters added for tracking.
void printCustomCounters() const {
- if (custom_counters_.size() == 0) {
+ if (custom_counters_.empty()) {
isc_throw(isc::InvalidOperation, "no custom counters specified");
}
for (CustomCountersMapIterator it = custom_counters_.begin();
diff --git a/tests/tools/perfdhcp/test_control.cc b/tests/tools/perfdhcp/test_control.cc
index 4f9f63e..a126d51 100644
--- a/tests/tools/perfdhcp/test_control.cc
+++ b/tests/tools/perfdhcp/test_control.cc
@@ -458,11 +458,11 @@ TestControl::getElapsedTime(const T& pkt1, const T& pkt2) {
uint64_t
TestControl::getNextExchangesNum() const {
CommandOptions& options = CommandOptions::instance();
- // Reset number of exchanges.
- uint64_t due_exchanges = 0;
// Get current time.
ptime now(microsec_clock::universal_time());
if (now >= send_due_) {
+ // Reset number of exchanges.
+ uint64_t due_exchanges = 0;
// If rate is specified from the command line we have to
// synchornize with it.
if (options.getRate() != 0) {
@@ -737,7 +737,7 @@ TestControl::sendPackets(const TestControlSocket& socket,
if (options.getIpVersion() == 4) {
// No template packets means that no -T option was specified.
// We have to build packets ourselfs.
- if (template_buffers_.size() == 0) {
+ if (template_buffers_.empty()) {
sendDiscover4(socket, preload);
} else {
// @todo add defines for packet type index that can be
@@ -747,7 +747,7 @@ TestControl::sendPackets(const TestControlSocket& socket,
} else {
// No template packets means that no -T option was specified.
// We have to build packets ourselfs.
- if (template_buffers_.size() == 0) {
+ if (template_buffers_.empty()) {
sendSolicit6(socket, preload);
} else {
// @todo add defines for packet type index that can be
@@ -966,7 +966,7 @@ TestControl::readPacketTemplate(const std::string& file_name) {
// Expect even number of digits.
if (hex_digits.size() % 2 != 0) {
isc_throw(OutOfRange, "odd number of digits in template file");
- } else if (hex_digits.size() == 0) {
+ } else if (hex_digits.empty()) {
isc_throw(OutOfRange, "template file " << file_name << " is empty");
}
std::vector<uint8_t> binary_stream;
diff --git a/tests/tools/perfdhcp/tests/command_options_helper.h b/tests/tools/perfdhcp/tests/command_options_helper.h
index 253fe12..dbb5c42 100644
--- a/tests/tools/perfdhcp/tests/command_options_helper.h
+++ b/tests/tools/perfdhcp/tests/command_options_helper.h
@@ -115,7 +115,7 @@ private:
// Tokenize string (space is a separator) using begin and end iteratos
std::vector<std::string> tokens(text_iterator, text_end);
- if (tokens.size() > 0) {
+ if (!tokens.empty()) {
// Allocate array of C-strings where we will store tokens
results = new char*[tokens.size()];
// Store tokens in C-strings array
diff --git a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
index ebb4f34..b55fc2e 100644
--- a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
+++ b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
@@ -347,7 +347,6 @@ TEST_F(StatsMgrTest, Delays) {
// Send DISCOVER, wait 2s and receive OFFER. This will affect
// counters in Stats Manager.
- const unsigned int delay1 = 2;
passDOPacketsWithDelay(stats_mgr, 2, common_transid);
// Initially min delay is equal to MAX_DOUBLE. After first packets
diff --git a/tests/tools/perfdhcp/tests/test_control_unittest.cc b/tests/tools/perfdhcp/tests/test_control_unittest.cc
index 8fe872d..6c9da16 100644
--- a/tests/tools/perfdhcp/tests/test_control_unittest.cc
+++ b/tests/tools/perfdhcp/tests/test_control_unittest.cc
@@ -1086,7 +1086,7 @@ TEST_F(TestControlTest, PacketTemplates) {
// Size of the file is 2 times larger than binary data size.
ASSERT_TRUE(createTemplateFile(file1, template1, template1.size() * 2));
ASSERT_TRUE(createTemplateFile(file2, template2, template2.size() * 2));
- CommandOptions& options = CommandOptions::instance();
+
NakedTestControl tc;
ASSERT_NO_THROW(
More information about the bind10-changes
mailing list