[2357] clean up a few #endif comments

diff --git a/src/lib/cryptolink/crypto_hmac.h b/src/lib/cryptolink/crypto_hmac.h
index 2f09f927d6f3075382056197315d98871044c798..ac827857b754365a6a51e5c2cab1e8c6c19539a7 100644 (file)
--- a/src/lib/cryptolink/crypto_hmac.h
+++ b/src/lib/cryptolink/crypto_hmac.h
@@ -205,5 +205,5 @@ void deleteHMAC(HMAC* hmac);
 } // namespace cryptolink
 } // namespace isc
 
-#endif // __ISC_CRYPTO_HMAC
+#endif // ISC_CRYPTO_HMAC_H
 

diff --git a/src/lib/datasrc/memory_datasrc.h b/src/lib/datasrc/memory_datasrc.h
index 2fc0f9054d09ddfc40293715f68946eb53982b40..4e277e07b296f652900225393e5a1c6ff0953bdd 100644 (file)
--- a/src/lib/datasrc/memory_datasrc.h
+++ b/src/lib/datasrc/memory_datasrc.h
@@ -360,7 +360,7 @@ extern "C" void destroyInstance(DataSourceClient* instance);
 
 }
 }
-#endif  // __DATA_SOURCE_MEMORY_H
+#endif  // MEMORY_DATA_SOURCE_H
 // Local Variables:
 // mode: c++
 // End:

diff --git a/src/lib/datasrc/sqlite3_accessor.h b/src/lib/datasrc/sqlite3_accessor.h
index b1b47055ff20020cbe56983d3e73c4be014445fd..a8112d40b17ebc42f4cb0e68b7cd94a5f128d7e7 100644 (file)
--- a/src/lib/datasrc/sqlite3_accessor.h
+++ b/src/lib/datasrc/sqlite3_accessor.h
@@ -291,7 +291,7 @@ extern "C" void destroyInstance(DataSourceClient* instance);
 }
 }
 
-#endif  // __DATASRC_SQLITE3_CONNECTION_H
+#endif  // DATASRC_SQLITE3_ACCESSOR_H
 
 // Local Variables:
 // mode: c++

diff --git a/src/lib/dns/rrtype-placeholder.h b/src/lib/dns/rrtype-placeholder.h
index 3be798a121aad2d368ac25289a663d74e1180d90..273a486f1ca5797c50ecca86cc8a9a7cfaaa0eb5 100644 (file)
--- a/src/lib/dns/rrtype-placeholder.h
+++ b/src/lib/dns/rrtype-placeholder.h
@@ -235,11 +235,11 @@ public:
     ///
     /// \param other the \c RRType object to compare against.
     /// \return true if the two RRTypes are not equal; otherwise false.
-    bool nequals(const RRType& other) const 
+    bool nequals(const RRType& other) const
     { return (typecode_ != other.typecode_); }
     /// \brief Same as \c nequals().
     bool operator!=(const RRType& other) const { return (nequals(other)); }
- 
+
     /// \brief Less-than comparison for RRType against \c other
     ///
     /// We define the less-than relationship based on their type codes;
@@ -319,6 +319,6 @@ operator<<(std::ostream& os, const RRType& rrtype);
 }
 #endif  // RRTYPE_H
 
-// Local Variables: 
+// Local Variables:
 // mode: c++
-// End: 
+// End:

diff --git a/src/lib/log/logger_specification.h b/src/lib/log/logger_specification.h
index 4aed560bbd5be79e17825fe2c74a504e6dfad024..663b0df050170464cf982f7ffad95d0b2bd06ced 100644 (file)
--- a/src/lib/log/logger_specification.h
+++ b/src/lib/log/logger_specification.h
@@ -146,11 +146,11 @@ private:
     std::string                 name_;          ///< Logger name
     isc::log::Severity          severity_;      ///< Severity for this logger
     int                         dbglevel_;      ///< Debug level
-    bool                        additive_;      ///< Chaining output 
+    bool                        additive_;      ///< Chaining output
     std::vector<OutputOption>   options_;       ///< Logger options
 };
 
 } // namespace log
 } // namespace isc
 
-#endif // __LOGGER_SPEC_IFICATIONH
+#endif // LOGGER_SPECIFICATION_H

diff --git a/src/lib/python/isc/datasrc/datasrc.h b/src/lib/python/isc/datasrc/datasrc.h
index ef9ad53da73ab42960ec8450eb56013219625fca..5a7a8f0a54b6a853fc8494008fdacc9da5603e50 100644 (file)
--- a/src/lib/python/isc/datasrc/datasrc.h
+++ b/src/lib/python/isc/datasrc/datasrc.h
@@ -43,7 +43,7 @@ extern PyObject* getDataSourceException(const char* ex_name);
 } // namespace datasrc
 } // namespace isc
 
-#endif // __PYTHON_ACL_DNS_H
+#endif // PYTHON_DATASRC_H
 
 // Local Variables:
 // mode: c++

diff --git a/src/lib/util/io_utilities.h b/src/lib/util/io_utilities.h
index 66b9a4e7ea601f5db7b3ffb8e520e5013cb1e596..cd35364f7cf4ea3783a2cf28cf702fd4c9b220e4 100644 (file)
--- a/src/lib/util/io_utilities.h
+++ b/src/lib/util/io_utilities.h
@@ -101,4 +101,4 @@ writeUint32(uint32_t value, uint8_t* buffer) {
 } // namespace util
 } // namespace isc
 
-#endif // __ASIOLINK_UTILITIES_H
+#endif // IO_UTILITIES_H

diff --git a/src/lib/util/range_utilities.h b/src/lib/util/range_utilities.h
index f9ca48f877b593b60e6dcf56e8adde34b5137040..42d9c4a39a1aa8ad19697b4a29225b43523c1e43 100644 (file)
--- a/src/lib/util/range_utilities.h
+++ b/src/lib/util/range_utilities.h
@@ -65,4 +65,4 @@ fillRandom(Iterator begin, Iterator end) {
 } // end of isc::util namespace
 } // end of isc namespace
 
-#endif  // __PKTINFO_UTIL_H_
+#endif  // RANGE_UTIL_H

diff --git a/src/lib/util/time_utilities.h b/src/lib/util/time_utilities.h
index 54276404631d72c4befcb27bd4b0e58e7af9ca9c..479f055bb5d170ee3ef9e03cf5398e69ced0f774 100644 (file)
--- a/src/lib/util/time_utilities.h
+++ b/src/lib/util/time_utilities.h
@@ -32,7 +32,7 @@ namespace isc {
 namespace util {
 
 ///
-/// \brief A standard DNS (or ISC) module exception that is thrown if 
+/// \brief A standard DNS (or ISC) module exception that is thrown if
 /// a time conversion function encounters bad input
 ///
 class InvalidTime : public Exception {
@@ -166,7 +166,7 @@ timeToText32(const uint32_t value);
 }
 }
 
-#endif  // __DNSSECTIME_H
+#endif  // TIME_UTILITIES_H
 
 // Local Variables:
 // mode: c++

diff --git a/src/lib/util/unittests/resource.h b/src/lib/util/unittests/resource.h
index 42dad876494bb975ebbdf44c4268dc9100c9d0ee..5a266b299e8180288a8e894f9a35b16bb96beee6 100644 (file)
--- a/src/lib/util/unittests/resource.h
+++ b/src/lib/util/unittests/resource.h
@@ -32,7 +32,7 @@ void dontCreateCoreDumps();
 } // end of namespace util
 } // end of namespace isc
 
-#endif /* __UTIL_UNITTESTS_RESOURCE_H */
+#endif // UTIL_UNITTESTS_RESOURCE_H
 
 // Local Variables:
 // mode: c++

diff --git a/tests/tools/perfdhcp/test_control.h b/tests/tools/perfdhcp/test_control.h
index 8ca610e4a97a775840bbb5f7a20c4b834f47faf5..245cf6db252b260009f9811bee1e7a53922a592f 100644 (file)
--- a/tests/tools/perfdhcp/test_control.h
+++ b/tests/tools/perfdhcp/test_control.h
@@ -97,7 +97,7 @@ static const size_t DHCPV6_IA_NA_OFFSET = 40;
 /// accept 'start' and 'stop' arguments. The first time it is called, it is
 /// called with the argument 'start' and the second time with the argument
 /// 'stop'.
-///   
+///
 /// The application is executed by calling fork() to fork the current perfdhcp
 /// process and then call execlp() to replace the current process image with
 /// the new one.
@@ -987,4 +987,4 @@ private:
 } // namespace perfdhcp
 } // namespace isc
 
-#endif // __COMMAND_OPTIONS_H
+#endif // TEST_CONTROL_H