Fixed problems issued by PC-lint.

diff --git a/src/config/configurationreader.cpp b/src/config/configurationreader.cpp
index 8c78ba4..9e5c2c8 100644 (file)
--- a/src/config/configurationreader.cpp
+++ b/src/config/configurationreader.cpp
@@ -96,7 +96,7 @@ bool ConfigurationReader::is_generic_options( const variables_map &vm ) const
 bool ConfigurationReader::parse_generic_options(
         const variables_map& vm,
         const options_description& visible_options
-)
+) const
 {
     if ( vm.count( HelpCmdStr ) )
     {
@@ -230,7 +230,7 @@ bool ConfigurationReader::process_command_line(
         const int argc,
         char *argv[],
         variables_map &vm
-)
+) const
 {
     try
     {
@@ -260,9 +260,9 @@ bool ConfigurationReader::process_command_line(
         }
 
     }
-    catch ( std::exception &e )
+    catch ( const std::exception &ex )
     {
-        cerr << e.what() << endl;
+        cerr << ex.what() << endl;
         return false;
     }
 
@@ -282,7 +282,7 @@ bool ConfigurationReader::process_configuration_file( variables_map &vm )
 bool ConfigurationReader::process_configuration_file(
         const string &config_file_name,
         variables_map &vm
-)
+) const
 {
     BOOST_ASSERT( !config_file_name.empty() );
 

diff --git a/src/config/configurationreader.h b/src/config/configurationreader.h
index d133f0d..875e4d0 100644 (file)
--- a/src/config/configurationreader.h
+++ b/src/config/configurationreader.h
@@ -31,7 +31,7 @@ private:
     bool parse_generic_options(
             const boost::program_options::variables_map &vm,
             const boost::program_options::options_description &visible_options
-    );
+    ) const;
 
     boost::program_options::options_description get_configuration_options() const;
     bool parse_configuration_options(
@@ -42,14 +42,14 @@ private:
             const int argc,
             char *argv[],
             boost::program_options::variables_map &vm
-    );
+    ) const;
     bool process_configuration_file(
             boost::program_options::variables_map &vm
     );
     bool process_configuration_file(
             const std::string &config_file_name,
             boost::program_options::variables_map &vm
-    );
+    ) const;
 
 private:
     Configuration Config;

diff --git a/src/dns/dnsresolver.cpp b/src/dns/dnsresolver.cpp
index 7c7672e..06c3cff 100644 (file)
--- a/src/dns/dnsresolver.cpp
+++ b/src/dns/dnsresolver.cpp
@@ -37,28 +37,28 @@ bool DnsResolver::resolve()
 
     try
     {
-        io_service io_service;
-        tcp::resolver resolver( io_service );
+        io_service io_serv;
+        tcp::resolver resolver( io_serv );
         tcp::resolver::query query( tcp::v4(), HostDnsAddress, "" );
         tcp::resolver::iterator it_first = resolver.resolve( query );
         tcp::resolver::iterator it_last = tcp::resolver::iterator();
         while ( it_first != it_last )
         {
-            string ip = (*it_first).endpoint().address().to_string();
+            string dest_ip = (*it_first).endpoint().address().to_string();
 
             HostAddress resolved_host;
-            resolved_host.set_ip( ip );
+            resolved_host.set_ip( dest_ip );
             ResolvedHostAddressList.push_back( resolved_host );
 
-            cerr << ip << endl;
+            cerr << dest_ip << endl;
 
             ++it_first;
         }
     }
-    catch ( boost::system::system_error& ex )
+    catch ( const std::exception &ex )
     {
-        cerr << "Error: host " << HostDnsAddress << " could not be resolved."
-             << endl;
+        cerr << "Error: host " << HostDnsAddress << " could not be resolved. "
+             << ex.what() << endl;
         return false;
     }
 
@@ -70,7 +70,7 @@ bool DnsResolver::resolve()
 /**
  * @return the amount of IPs resolved for the DNS.
  */
-int DnsResolver::get_resolved_ip_count()
+int DnsResolver::get_resolved_ip_count() const
 {
     int resolved_ip_count = ResolvedHostAddressList.size();
 

diff --git a/src/dns/dnsresolver.h b/src/dns/dnsresolver.h
index 990cf31..b551b6b 100644 (file)
--- a/src/dns/dnsresolver.h
+++ b/src/dns/dnsresolver.h
@@ -17,7 +17,7 @@ public:
     virtual ~DnsResolver();
 
     bool resolve();
-    int get_resolved_ip_count();
+    int get_resolved_ip_count() const;
     std::string get_next_ip();
 
 private:

diff --git a/src/icmp/checksumcalculator.h b/src/icmp/checksumcalculator.h
index 33f2158..ec8d17f 100644 (file)
--- a/src/icmp/checksumcalculator.h
+++ b/src/icmp/checksumcalculator.h
@@ -15,8 +15,8 @@ class ChecksumCalculator
 {
 public:
     ChecksumCalculator(
-            Iterator body_begin,
-            Iterator body_end
+            const Iterator &body_begin,
+            const Iterator &body_end
     );
 
     uint16_t compute(
@@ -34,14 +34,12 @@ private:
 
 template<typename Iterator>
     ChecksumCalculator<Iterator>::ChecksumCalculator(
-            Iterator body_begin,
-            Iterator body_end
+            const Iterator &body_begin,
+            const Iterator &body_end
     ) :
-        BodyBegin(),
-        BodyEnd()
+        BodyBegin( body_begin ),
+        BodyEnd( body_end )
     {
-        this->BodyBegin = body_begin;
-        this->BodyEnd = body_end;
     }
 
 template<typename Iterator>

diff --git a/src/icmp/icmppacket.cpp b/src/icmp/icmppacket.cpp
index 8857196..43c1873 100644 (file)
--- a/src/icmp/icmppacket.cpp
+++ b/src/icmp/icmppacket.cpp
@@ -44,7 +44,7 @@ bool IcmpPacket::match(
         IcmpHeader::IcmpType type,
         uint16_t identifier,
         uint16_t sequence_number
-)
+) const
 {
     bool type_match = IcmpPayloadHeader.get_type() == type;
     bool identifier_match = IcmpPayloadHeader.get_identifier() == identifier;

diff --git a/src/icmp/icmppacket.h b/src/icmp/icmppacket.h
index 2a5c4b2..01ecac7 100644 (file)
--- a/src/icmp/icmppacket.h
+++ b/src/icmp/icmppacket.h
@@ -70,7 +70,7 @@ public:
             IcmpHeader::IcmpType type,
             uint16_t identifier,
             uint16_t sequence_number
-    );
+    ) const;
 
     friend std::istream& operator>>(
             std::istream &is,

diff --git a/src/main.cpp b/src/main.cpp
index ceb9cfc..e3894d4 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char* argv[] )
     bool read_success = config_reader.parse( argc, argv );
     if ( read_success )
     {
-        io_service io_service;
+        io_service io_serv;
 
         Configuration config = config_reader.get_configuration();
 
@@ -47,7 +47,7 @@ int main( int argc, char* argv[] )
             int ping_interval_in_sec = (*host).get_interval_in_sec();
             PingSchedulerItem scheduler(
                     new PingScheduler(
-                            io_service,
+                            io_serv,
                             ping_address,
                             ping_interval_in_sec,
                             ping_fail_limit,
@@ -64,7 +64,7 @@ int main( int argc, char* argv[] )
         }
 
         // Main loop to handle scheduled ping requests
-        io_service.run();
+        io_serv.run();
     }
 
     return 0;

diff --git a/src/notify/statusnotifiercommand.cpp b/src/notify/statusnotifiercommand.cpp
index 039f7df..d1c753a 100644 (file)
--- a/src/notify/statusnotifiercommand.cpp
+++ b/src/notify/statusnotifiercommand.cpp
@@ -38,7 +38,7 @@ bool StatusNotifierCommand::set_token_value(
     BOOST_ASSERT( !value.empty() );
     BOOST_ASSERT( !CommandStr.empty() );
 
-    size_t token_begin_pos = CommandStr.find( token );
+    const size_t token_begin_pos = CommandStr.find( token );
     if ( token_begin_pos == string::npos )
     {
         return false; // token string not found!
@@ -53,7 +53,7 @@ bool StatusNotifierCommand::set_token_value(
     return true;
 }
 
-bool StatusNotifierCommand::execute()
+bool StatusNotifierCommand::execute() const
 {
     BOOST_ASSERT( !CommandStr.empty() );
 

diff --git a/src/notify/statusnotifiercommand.h b/src/notify/statusnotifiercommand.h
index 11c2f37..06e0870 100644 (file)
--- a/src/notify/statusnotifiercommand.h
+++ b/src/notify/statusnotifiercommand.h
@@ -25,7 +25,7 @@ public:
             const std::string &value
     );
 
-    bool execute();
+    bool execute() const;
 
 private:
     std::string get_application_string() const;

diff --git a/src/ping/boostpinger.cpp b/src/ping/boostpinger.cpp
index 4d67488..f48f49c 100644 (file)
--- a/src/ping/boostpinger.cpp
+++ b/src/ping/boostpinger.cpp
@@ -22,14 +22,14 @@ using namespace boost::posix_time;
 //-----------------------------------------------------------------------------
 
 BoostPinger::BoostPinger(
-        boost::asio::io_service &io_service,
+        boost::asio::io_service &io_serv,
         const int echo_reply_timeout_in_sec
 ) :
-    IoService( io_service ),
-    Resolver( io_service ),
+    IoService( io_serv ),
+    Resolver( io_serv ),
     DestinationEndpoint(),
-    Socket( io_service, icmp::v4() ),
-    Timer( io_service ),
+    Socket( io_serv, icmp::v4() ),
+    Timer( io_serv ),
     SequenceNumber( 0 ),
     TimeSent( microsec_clock::universal_time() ),
     ReplyBuffer(),

diff --git a/src/ping/boostpinger.h b/src/ping/boostpinger.h
index f363242..9b383b0 100644 (file)
--- a/src/ping/boostpinger.h
+++ b/src/ping/boostpinger.h
@@ -17,7 +17,7 @@ class BoostPinger
 {
 public:
     BoostPinger(
-            boost::asio::io_service &io_service,
+            boost::asio::io_service &io_serv,
             const int echo_reply_timeout_in_sec
     );
     virtual ~BoostPinger();
@@ -29,7 +29,7 @@ private:
     {
         PingStatus_NotSent,
         PingStatus_SuccessReply,
-        PingStatus_FailureTimeout,
+        PingStatus_FailureTimeout
     };
 
 private:

diff --git a/src/ping/pingscheduler.cpp b/src/ping/pingscheduler.cpp
index 47d916d..aae3204 100644 (file)
--- a/src/ping/pingscheduler.cpp
+++ b/src/ping/pingscheduler.cpp
@@ -18,15 +18,15 @@ using namespace boost::posix_time;
 //-----------------------------------------------------------------------------
 
 PingScheduler::PingScheduler(
-        boost::asio::io_service &io_service,
+        boost::asio::io_service &io_serv,
         const string &ping_address,
         const long ping_interval_in_sec,
         const int ping_fail_percentage_limit,
         shared_ptr<LinkStatusAnalyzer> link_analyzer
 
 ) :
-    IoService( io_service ),
-    Timer( io_service ),
+    IoService( io_serv ),
+    Timer( io_serv ),
     TimeSentLastPing( microsec_clock::universal_time() ),
     PingIntervalInSec( ping_interval_in_sec ),
     IpList( ping_address ),

diff --git a/src/ping/pingscheduler.h b/src/ping/pingscheduler.h
index 915e819..d2486df 100644 (file)
--- a/src/ping/pingscheduler.h
+++ b/src/ping/pingscheduler.h
@@ -24,7 +24,7 @@ class PingScheduler
 {
 public:
     PingScheduler(
-            boost::asio::io_service &io_service,
+            boost::asio::io_service &io_serv,
             const std::string &ping_address,
             const long ping_interval_in_sec,
             const int ping_fail_percentage_limit,