BIND 10 trac1003, updated. eff38a97dea5a54b7a9f3e1213cd5e8b2b15be37 [trac1003] Fix typos and update comments
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jul 19 12:16:08 UTC 2011
The branch, trac1003 has been updated
via eff38a97dea5a54b7a9f3e1213cd5e8b2b15be37 (commit)
from 21b4324449c7091d36fc3e153d3e0f4ea3515278 (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 eff38a97dea5a54b7a9f3e1213cd5e8b2b15be37
Author: Stephen Morris <stephen at isc.org>
Date: Tue Jul 19 12:07:33 2011 +0100
[trac1003] Fix typos and update comments
-----------------------------------------------------------------------
Summary of changes:
src/lib/config/ccsession.cc | 17 ++++++++++-------
src/lib/config/ccsession.h | 4 ++--
2 files changed, 12 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc
index 9b80930..9f4a5c6 100644
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/ccsession.cc
@@ -329,7 +329,7 @@ getRelatedLoggers(ConstElementPtr loggers) {
.arg(cur_name);
} else if (!cur_name.empty() && (cur_name[0] != '*')) {
- // Not a wildcard logger and we are ignore it, note the fact.
+ // Not a wildcard logger and we are ignoring it.
LOG_DEBUG(config_logger, DBG_CONFIG_PROCESS,
CONFIG_LOG_IGNORE_EXPLICIT).arg(cur_name);
}
@@ -338,7 +338,7 @@ getRelatedLoggers(ConstElementPtr loggers) {
// Mow find the wildcard names (the one that start with "*").
BOOST_FOREACH(ConstElementPtr cur_logger, loggers->listValue()) {
std::string cur_name = cur_logger->get("name")->stringValue();
- // if name is '*', or starts with '*.', replace * with root
+ // If name is '*', or starts with '*.', replace * with root
// logger name.
if (cur_name == "*" || cur_name.length() > 1 &&
cur_name[0] == '*' && cur_name[1] == '.') {
@@ -347,17 +347,20 @@ getRelatedLoggers(ConstElementPtr loggers) {
std::string mod_name = cur_name;
mod_name.replace(0, 1, root_name);
- // Mow add it to the result list, but only if a logger with
- // that name was not configured explicitly
+ // Now add it to the result list, but only if a logger with
+ // that name was not configured explicitly.
if (our_names.find(mod_name) == our_names.end()) {
- // We substitute the name here already, but as
- // we are dealing with consts, we copy the data
+
+ // We substitute the name here, but as we are dealing with
+ // consts, we need to copy the data.
result->add(copyLogger(cur_logger, mod_name));
LOG_DEBUG(config_logger, DBG_CONFIG_PROCESS,
CONFIG_LOG_WILD_MATCH).arg(cur_name);
} else if (!cur_name.empty() && (cur_name[0] == '*')) {
- // Is a wildcard and we are ignoring it.
+ // Is a wildcard and we are ignoring it (because the wildcard
+ // expands to a specification that we already encountered when
+ // processing explicit names).
LOG_DEBUG(config_logger, DBG_CONFIG_PROCESS,
CONFIG_LOG_IGNORE_WILD).arg(cur_name);
}
diff --git a/src/lib/config/ccsession.h b/src/lib/config/ccsession.h
index 3d3cd41..50bb65c 100644
--- a/src/lib/config/ccsession.h
+++ b/src/lib/config/ccsession.h
@@ -377,10 +377,10 @@ default_logconfig_handler(const std::string& module_name,
/// \brief Returns the loggers related to this module
///
/// This function does two things;
-/// - it drops the configuration parts for loggers for other modules
+/// - it drops the configuration parts for loggers for other modules.
/// - it replaces the '*' in the name of the loggers by the name of
/// this module, but *only* if the expanded name is not configured
-/// explicitly
+/// explicitly.
///
/// Examples: if this is the module b10-resolver,
/// For the config names ['*', 'b10-auth']
More information about the bind10-changes
mailing list