BIND 10 trac2835, updated. d25f0e1e01a6cc3991ae63f0957c61ec171395ce [2835] editorial cleanups: use _ for var names, fixed a typo

[BIND 10 source code commits]

The branch, trac2835 has been updated
       via  d25f0e1e01a6cc3991ae63f0957c61ec171395ce (commit)
      from  0be5bed016c3b12abf5e7049ab7b63d2d474efc0 (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 d25f0e1e01a6cc3991ae63f0957c61ec171395ce
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 19 00:23:02 2013 -0700

    [2835] editorial cleanups: use _ for var names, fixed a typo

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/client_list.cc |    4 ++--
 src/lib/datasrc/client_list.h  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 51d1af3..8ae0906 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -114,8 +114,8 @@ ConfigurableClientList::configure(const ConstElementPtr& config,
                                   dconf->contains("cache-enable") &&
                                   dconf->get("cache-enable")->boolValue());
             // Get the name (either explicit, or guess)
-            const ConstElementPtr nameElem(dconf->get("name"));
-            const string name(nameElem ? nameElem->stringValue() : type);
+            const ConstElementPtr name_elem(dconf->get("name"));
+            const string name(name_elem ? name_elem->stringValue() : type);
             if (!used_names.insert(name).second) {
                 isc_throw(ConfigurationError, "Duplicit name in client list: "
                           << name);
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index a3d8e53..4f74d32 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -65,7 +65,7 @@ enum MemorySegmentState {
 /// \brief Status of one data source.
 ///
 /// This indicates the status a data soure is in. It is used with segment
-/// and cache management, to discover the data sources than need external
+/// and cache management, to discover the data sources that need external
 /// mapping or local loading.
 class DataSourceStatus {
 public: