From: Thomas Jarosch Date: Mon, 12 Dec 2011 11:33:24 +0000 (+0100) Subject: More constification X-Git-Tag: v1.3~43 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=6fd0993e90be4bc6157b3e28bf4c8e9331de796e;p=pingcheck More constification Hide "xyz could be made const" linter message for modifications done through a boost::shared_ptr. (Pc-Lint can't detect those properly). --- diff --git a/src/config/configurationreader.cpp b/src/config/configurationreader.cpp index 9eee6fd..eac230e 100644 --- a/src/config/configurationreader.cpp +++ b/src/config/configurationreader.cpp @@ -408,7 +408,7 @@ bool ConfigurationReader::process_command_line( const int argc, char *argv[], variables_map &vm -) +) const { try { diff --git a/src/config/configurationreader.h b/src/config/configurationreader.h index 3365ce6..2d2176d 100644 --- a/src/config/configurationreader.h +++ b/src/config/configurationreader.h @@ -63,7 +63,7 @@ private: const int argc, char *argv[], boost::program_options::variables_map &vm - ); + ) const; bool process_configuration_file( boost::program_options::variables_map &vm ); diff --git a/src/dns/dnsresolver.cpp b/src/dns/dnsresolver.cpp index 1384ba0..6a9cba5 100644 --- a/src/dns/dnsresolver.cpp +++ b/src/dns/dnsresolver.cpp @@ -162,11 +162,11 @@ string DnsResolver::get_next_ip() * @return @c true if the last IPs resolved for the host have expired, thus * requiring another query for up-to-date IPs. */ -bool DnsResolver::expired_resolved_ip() +bool DnsResolver::expired_resolved_ip() const { const int threshold = 10; // TODO configurable - BOOST_FOREACH( HostAddress host_address, ResolvedHostAddressList ) + BOOST_FOREACH( const HostAddress &host_address, ResolvedHostAddressList ) { int ttl = host_address.get_ttl().get_updated_value(); if ( ttl <= threshold ) diff --git a/src/dns/dnsresolver.h b/src/dns/dnsresolver.h index d9d011b..abc82e1 100644 --- a/src/dns/dnsresolver.h +++ b/src/dns/dnsresolver.h @@ -46,7 +46,7 @@ public: bool resolve(); int get_resolved_ip_count() const; std::string get_next_ip(); - bool expired_resolved_ip(); + bool expired_resolved_ip() const; private: bool handle_ip_address(); diff --git a/src/host/hoststatusanalyzer.cpp b/src/host/hoststatusanalyzer.cpp index 1b072d6..76bea2f 100644 --- a/src/host/hoststatusanalyzer.cpp +++ b/src/host/hoststatusanalyzer.cpp @@ -128,8 +128,7 @@ void HostStatusAnalyzer::analyze_ping_statistics() { LinkAnalyzer->notify_host_up( HostAddress ); } - -} +} //lint !e1762 void HostStatusAnalyzer::reset_ping_counters() { diff --git a/src/host/messagepayload.cpp b/src/host/messagepayload.cpp index e23dfa4..0048566 100644 --- a/src/host/messagepayload.cpp +++ b/src/host/messagepayload.cpp @@ -234,7 +234,7 @@ void MessagePayload::encode16( Payload[ left_byte ] = static_cast( value >> 8 ); Payload[ right_byte ] = static_cast( value & 0xFF ); -} +} //lint !e1762 /** * @brief Retrieve 32 bits from the payload buffer. @@ -297,7 +297,7 @@ void MessagePayload::encode32( Payload[ ++current_byte ] = static_cast( value & 0xFF ); BOOST_ASSERT( current_byte == last_byte ); -} +} //lint !e1762 /** * @brief Read/Extract all the data from the input stream @a is and stores it diff --git a/src/host/pinginterval.cpp b/src/host/pinginterval.cpp index 0669d3d..2f0d5e6 100644 --- a/src/host/pinginterval.cpp +++ b/src/host/pinginterval.cpp @@ -38,7 +38,7 @@ PingInterval::~PingInterval() { } -PingInterval::operator PingIntervalType() +PingInterval::operator PingIntervalType() const { BOOST_ASSERT( 0 < Interval ); diff --git a/src/host/pinginterval.h b/src/host/pinginterval.h index a4a7afb..6289bb6 100644 --- a/src/host/pinginterval.h +++ b/src/host/pinginterval.h @@ -41,7 +41,7 @@ public: PingInterval( PingIntervalType interval ); ~PingInterval(); - operator PingIntervalType(); + operator PingIntervalType() const; void back_to_original(); void speed_up(); diff --git a/src/icmp/icmpv4header.cpp b/src/icmp/icmpv4header.cpp index bc6d8ce..fbf441c 100644 --- a/src/icmp/icmpv4header.cpp +++ b/src/icmp/icmpv4header.cpp @@ -49,7 +49,7 @@ Icmpv4Type Icmpv4Header::get_type() const void Icmpv4Header::set_type( const Icmpv4Type type ) { get_icmp_message_format()->set_type_v4( type ); -} +} //lint !e1762 uint8_t Icmpv4Header::get_code() const { @@ -59,7 +59,7 @@ uint8_t Icmpv4Header::get_code() const void Icmpv4Header::set_code( const uint8_t code ) { get_icmp_message_format()->set_code( code ); -} +} //lint !e1762 uint16_t Icmpv4Header::get_checksum() const { @@ -69,7 +69,7 @@ uint16_t Icmpv4Header::get_checksum() const void Icmpv4Header::set_checksum( const uint16_t checksum ) { get_icmp_message_format()->set_checksum( checksum ); -} +} //lint !e1762 uint16_t Icmpv4Header::get_identifier() const { @@ -79,7 +79,7 @@ uint16_t Icmpv4Header::get_identifier() const void Icmpv4Header::set_identifier( const uint16_t identifier ) { get_icmp_message_format()->set_identifier( identifier ); -} +} //lint !e1762 uint16_t Icmpv4Header::get_sequence_number() const { @@ -89,7 +89,7 @@ uint16_t Icmpv4Header::get_sequence_number() const void Icmpv4Header::set_sequence_number( const uint16_t sequence_number ) { get_icmp_message_format()->set_sequence_number( sequence_number ); -} +} //lint !e1762 shared_ptr Icmpv4Header::get_icmp_message_format() const { diff --git a/src/icmp/icmpv6header.cpp b/src/icmp/icmpv6header.cpp index 8d9a54c..0baff6d 100644 --- a/src/icmp/icmpv6header.cpp +++ b/src/icmp/icmpv6header.cpp @@ -49,7 +49,7 @@ Icmpv6Type Icmpv6Header::get_type() const void Icmpv6Header::set_type( const Icmpv6Type type ) { get_icmp_message_format()->set_type_v6( type ); -} +} //lint !e1762 uint8_t Icmpv6Header::get_code() const { @@ -59,7 +59,7 @@ uint8_t Icmpv6Header::get_code() const void Icmpv6Header::set_code( const uint8_t code ) { get_icmp_message_format()->set_code( code ); -} +} //lint !e1762 uint16_t Icmpv6Header::get_checksum() const { @@ -69,7 +69,7 @@ uint16_t Icmpv6Header::get_checksum() const void Icmpv6Header::set_checksum( const uint16_t checksum ) { get_icmp_message_format()->set_checksum( checksum ); -} +} //lint !e1762 uint16_t Icmpv6Header::get_identifier() const { @@ -79,7 +79,7 @@ uint16_t Icmpv6Header::get_identifier() const void Icmpv6Header::set_identifier( const uint16_t identifier ) { get_icmp_message_format()->set_identifier( identifier ); -} +} //lint !e1762 uint16_t Icmpv6Header::get_sequence_number() const { @@ -89,7 +89,7 @@ uint16_t Icmpv6Header::get_sequence_number() const void Icmpv6Header::set_sequence_number( const uint16_t sequence_number ) { get_icmp_message_format()->set_sequence_number( sequence_number ); -} +} //lint !e1762 shared_ptr Icmpv6Header::get_icmp_message_format() const { diff --git a/src/tcp/tcpheader.cpp b/src/tcp/tcpheader.cpp index 5f743ad..a1984d7 100644 --- a/src/tcp/tcpheader.cpp +++ b/src/tcp/tcpheader.cpp @@ -310,7 +310,7 @@ ostream& operator<<( ostream& os, const TcpHeader& header ) return header.Payload.write( os ); } -uint16_t TcpHeader::calculate_checksum( const uint16_t *word_array, int size ) +uint16_t TcpHeader::calculate_checksum( const uint16_t *word_array, int size ) const { unsigned long cksum = 0; while ( size > 1 ) diff --git a/src/tcp/tcpheader.h b/src/tcp/tcpheader.h index 33cd52d..7387d05 100644 --- a/src/tcp/tcpheader.h +++ b/src/tcp/tcpheader.h @@ -130,7 +130,7 @@ public: ); private: - uint16_t calculate_checksum( const uint16_t *word_array, int size ); + uint16_t calculate_checksum( const uint16_t *word_array, int size ) const; MessagePayload Payload; }; diff --git a/src/tcp/tcppinger.cpp b/src/tcp/tcppinger.cpp index 99fc96e..74499f9 100644 --- a/src/tcp/tcppinger.cpp +++ b/src/tcp/tcppinger.cpp @@ -133,7 +133,7 @@ void TcpPinger::ping( start_receive(); } -address TcpPinger::get_source_address() +address TcpPinger::get_source_address() const { return NetInterface.get_address( Protocol ); } diff --git a/src/tcp/tcppinger.h b/src/tcp/tcppinger.h index 2f55f26..1fdbf4e 100644 --- a/src/tcp/tcppinger.h +++ b/src/tcp/tcppinger.h @@ -57,7 +57,7 @@ public: ); private: - boost::asio::ip::address get_source_address(); + boost::asio::ip::address get_source_address() const; boost::asio::ip::address get_destination_address() const; uint16_t get_source_port() const;