BIND 10 trac2357, updated. 0eb033a6b10eac2e2767923ccfe5e74f2d2b2680 [2357] clean up a few #endif comments
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Oct 25 16:29:49 UTC 2012
The branch, trac2357 has been updated
via 0eb033a6b10eac2e2767923ccfe5e74f2d2b2680 (commit)
via 5744cc1cf3c348d120ef5dc3f1f97e23a0aa6fea (commit)
from fa6cef4dfbadd457c75ef5fc5f7ffe42d916a2de (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 0eb033a6b10eac2e2767923ccfe5e74f2d2b2680
Author: Jelte Jansen <jelte at isc.org>
Date: Thu Oct 25 18:29:32 2012 +0200
[2357] clean up a few #endif comments
commit 5744cc1cf3c348d120ef5dc3f1f97e23a0aa6fea
Author: Jelte Jansen <jelte at isc.org>
Date: Thu Oct 25 18:13:52 2012 +0200
[2357] additional __ fixes
in generator for rdataclass.h, and updated a doxygen comment
-----------------------------------------------------------------------
Summary of changes:
src/lib/cryptolink/crypto_hmac.h | 2 +-
src/lib/datasrc/memory_datasrc.h | 2 +-
src/lib/datasrc/sqlite3_accessor.h | 2 +-
src/lib/dns/gen-rdatacode.py.in | 2 +-
src/lib/dns/rrtype-placeholder.h | 8 ++++----
src/lib/log/compiler/message.cc | 2 +-
src/lib/log/logger_specification.h | 4 ++--
src/lib/python/isc/datasrc/datasrc.h | 2 +-
src/lib/util/io_utilities.h | 2 +-
src/lib/util/range_utilities.h | 2 +-
src/lib/util/time_utilities.h | 4 ++--
src/lib/util/unittests/resource.h | 2 +-
tests/tools/perfdhcp/test_control.h | 4 ++--
13 files changed, 19 insertions(+), 19 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/cryptolink/crypto_hmac.h b/src/lib/cryptolink/crypto_hmac.h
index 2f09f92..ac82785 100644
--- 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 2fc0f90..4e277e0 100644
--- 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 b1b4705..a8112d4 100644
--- 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/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in
index f3cd5df..e51dfc5 100755
--- a/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@ -74,7 +74,7 @@ def import_classheader(class_txt, type_txt, type_code, file):
# for each CLASS_n/TYPE_m.h
rdata_header = open(file, 'r')
content = ''
- guard_macro = '__' + class_txt.upper() + '_' + type_txt.upper()
+ guard_macro = class_txt.upper() + '_' + type_txt.upper()
guard_macro += '_' + type_code + '_H'
for line in rdata_header.readlines():
if re.match('// BEGIN_HEADER_GUARD', line):
diff --git a/src/lib/dns/rrtype-placeholder.h b/src/lib/dns/rrtype-placeholder.h
index 3be798a..273a486 100644
--- 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/compiler/message.cc b/src/lib/log/compiler/message.cc
index 990b127..7bff8bd 100644
--- a/src/lib/log/compiler/message.cc
+++ b/src/lib/log/compiler/message.cc
@@ -122,7 +122,7 @@ currentTime() {
/// \brief Create Header Sentinel
///
/// Given the name of a file, create an \#ifdef sentinel name. The name is
-/// __<name>_<ext>, where <name> is the name of the file, and <ext>
+/// <name>_<ext>, where <name> is the name of the file, and <ext>
/// is the extension less the leading period. The sentinel will be upper-case.
///
/// \param file Filename object representing the file.
diff --git a/src/lib/log/logger_specification.h b/src/lib/log/logger_specification.h
index 4aed560..663b0df 100644
--- 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 ef9ad53..5a7a8f0 100644
--- 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 66b9a4e..cd35364 100644
--- 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 f9ca48f..42d9c4a 100644
--- 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 5427640..479f055 100644
--- 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 42dad87..5a266b2 100644
--- 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 8ca610e..245cf6d 100644
--- 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
More information about the bind10-changes
mailing list