BIND 10 trac2833, updated. 339e9f7077179abbeeb3a3f16a6f1f95cb22786c [2833] use NULL instead of 0.

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Apr 2 21:21:59 UTC 2013


The branch, trac2833 has been updated
       via  339e9f7077179abbeeb3a3f16a6f1f95cb22786c (commit)
       via  32c1b0777e781501e347ac160e176d2ab6ddcfad (commit)
       via  9a8bc5b083049e6d42fe38397ea44375d8634020 (commit)
      from  0363b4187fe3c1a148ad424af39e12846610d2d7 (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 339e9f7077179abbeeb3a3f16a6f1f95cb22786c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Apr 2 14:21:23 2013 -0700

    [2833] use NULL instead of 0.
    
    may need some more discussion, but not the point for this branch anyway,
    and at least it's more consistent with rest of the source code.

commit 32c1b0777e781501e347ac160e176d2ab6ddcfad
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Apr 2 14:01:17 2013 -0700

    [2833] clarified the meaning of data source config passed to CacheConfig

commit 9a8bc5b083049e6d42fe38397ea44375d8634020
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Apr 2 13:58:37 2013 -0700

    [2833] clarified error types, avoid using the word of "syntax"

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

Summary of changes:
 src/lib/datasrc/cache_config.h                |   13 ++++++++-----
 src/lib/datasrc/tests/zone_loader_unittest.cc |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/cache_config.h b/src/lib/datasrc/cache_config.h
index eb63a03..247fb18 100644
--- a/src/lib/datasrc/cache_config.h
+++ b/src/lib/datasrc/cache_config.h
@@ -43,7 +43,7 @@ public:
 /// \brief Configuration for in-memory cache of a data source.
 ///
 /// This class understands and validates the configuration parameters for
-/// \c DataSourceClient related to in-memory cache, and convert it to native,
+/// \c DataSourceClient related to in-memory cache, and converts it to native,
 /// type-safe objects for the convenience of the user of this class.
 /// Specifically, it allows the user to get the underlying memory segment
 /// type for the cache as a string and to iterate over zone names to be
@@ -96,7 +96,7 @@ public:
     ///
     /// For other data source types than "MasterFiles", cache can be disabled.
     /// In this case cache-zones configuration item is simply ignored, even
-    /// it contains a syntax or semantics error.
+    /// it contains an error that would other trigger an exception.
     ///
     /// The specified set of zones (directly in "params" in case of
     /// "MasterFile", and specified in "cache-zones" for others) can be
@@ -110,15 +110,18 @@ public:
     /// in the configuration (see above)
     /// \throw CacheConfigError There is a semantics error in the given
     /// configuration (see above)
-    /// \throw data::TypeError There is a syntax error in the given
+    /// \throw data::TypeError Invalid type of data is found in the
     /// configuration (see above)
+    /// \throw Other Exceptions from the dns::Name class when conversion from
+    /// text fails (see above)
     ///
     /// \param datasrc_type Type of data source. This must be the "type"
     /// value of the data source configuration.
     /// \param datasrc_client Client of the underlying data source for the
     /// cache, if it's used; for MasterFiles types it's null.
-    /// \param datasrc_conf System-wide configuration for the data source.
-    /// This must be the configuration element for the data source.
+    /// \param datasrc_conf Configuration element for the data source.
+    /// This must be the value of, e.g., data_sources/classes/IN[0] of
+    /// BIND 10 configuration.
     /// \param allowed Whether in-memory cache is allowed by the process.
     /// This must be derived from the allow_cache parameter of
     /// \c ConfigurableClientList::configure().
diff --git a/src/lib/datasrc/tests/zone_loader_unittest.cc b/src/lib/datasrc/tests/zone_loader_unittest.cc
index 271e4d1..eabcd65 100644
--- a/src/lib/datasrc/tests/zone_loader_unittest.cc
+++ b/src/lib/datasrc/tests/zone_loader_unittest.cc
@@ -292,7 +292,7 @@ protected:
     {
         // Use ROOT_NAME as a placeholder; it will be ignored if filename is
         // null.
-        prepareSource(Name::ROOT_NAME(), 0);
+        prepareSource(Name::ROOT_NAME(), NULL);
     }
     void prepareSource(const Name& zone, const char* filename) {
         // Cleanup the existing data in the right order



More information about the bind10-changes mailing list