BIND 10 trac2445, updated. 2fd85850524510bb6d4452f2c9b863400b3949dc [2445] minor cleanups: brace position, indent, use 'protected' in test class

[BIND 10 source code commits]

The branch, trac2445 has been updated
       via  2fd85850524510bb6d4452f2c9b863400b3949dc (commit)
       via  233aebcb70f15914e141fef4982ad7d0028fbd9f (commit)
       via  bedf7f9f268f67f5522e620a385452cf6083b4ff (commit)
      from  d506b61e5f2e50d228ac8541d6927594861a25e5 (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 2fd85850524510bb6d4452f2c9b863400b3949dc
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 5 00:11:57 2012 -0800

    [2445] minor cleanups: brace position, indent, use 'protected' in test class

commit 233aebcb70f15914e141fef4982ad7d0028fbd9f
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 5 00:11:18 2012 -0800

    [2445] do explicit check for NULL against a pointer

commit bedf7f9f268f67f5522e620a385452cf6083b4ff
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 5 00:10:49 2012 -0800

    [2445] constify, unify two short lines, spacing

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

Summary of changes:
 src/bin/auth/main.cc                     |    2 +-
 src/lib/log/logger_manager_impl.cc       |    3 +--
 src/lib/log/logger_support.cc            |    2 +-
 src/lib/log/tests/log_buffer_unittest.cc |    4 ++--
 src/lib/python/isc/log/log.cc            |    7 +++----
 5 files changed, 8 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 2057b89..e90d199 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -256,7 +256,7 @@ main(int argc, char* argv[]) {
 
     // If we haven't registered callback for data sources, this will be just
     // no-op.
-    if (config_session) {
+    if (config_session != NULL) {
         config_session->removeRemoteConfig("data_sources");
     }
 
diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index 6f0d900..7811afe 100644
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -148,8 +148,7 @@ LoggerManagerImpl::createFileAppender(log4cplus::Logger& logger,
 }
 
 void
-LoggerManagerImpl::createBufferAppender(log4cplus::Logger& logger)
-{
+LoggerManagerImpl::createBufferAppender(log4cplus::Logger& logger) {
     log4cplus::SharedAppenderPtr bufferapp(new BufferAppender(getLogBuffer()));
     bufferapp->setName("buffer");
     logger.addAppender(bufferapp);
diff --git a/src/lib/log/logger_support.cc b/src/lib/log/logger_support.cc
index b4fe064..cab52ad 100644
--- a/src/lib/log/logger_support.cc
+++ b/src/lib/log/logger_support.cc
@@ -46,7 +46,7 @@ setLoggingInitialized(bool state) {
 
 void
 initLogger(const string& root, isc::log::Severity severity, int dbglevel,
-    const char* file, bool buffer) {
+           const char* file, bool buffer) {
     LoggerManager::init(root, severity, dbglevel, file, buffer);
 }
 
diff --git a/src/lib/log/tests/log_buffer_unittest.cc b/src/lib/log/tests/log_buffer_unittest.cc
index 1c1bc20..c8d1b21 100644
--- a/src/lib/log/tests/log_buffer_unittest.cc
+++ b/src/lib/log/tests/log_buffer_unittest.cc
@@ -30,7 +30,7 @@ namespace isc {
 namespace log {
 
 class LogBufferTest : public ::testing::Test {
-public:
+protected:
     LogBufferTest() : appender1(new BufferAppender(buffer1)),
                       appender2(new BufferAppender(buffer2)),
                       logger(log4cplus::Logger::getInstance("buffer"))
@@ -49,7 +49,7 @@ public:
         buffer2.flush();
     }
 
-    void checkBufferedSize(LogBuffer& buffer, size_t expected) {
+    void checkBufferedSize(const LogBuffer& buffer, size_t expected) const {
         ASSERT_EQ(expected, buffer.stored_.size());
     }
 
diff --git a/src/lib/python/isc/log/log.cc b/src/lib/python/isc/log/log.cc
index cf095ea..2905a31 100644
--- a/src/lib/python/isc/log/log.cc
+++ b/src/lib/python/isc/log/log.cc
@@ -172,12 +172,11 @@ init(PyObject*, PyObject* args, PyObject* arg_keywords) {
     const char* severity("INFO");
     bool buffer = false;
     int dbglevel(0);
-    const char* keywords[] = { "name", "severity", "debuglevel", "file",
-                               "buffer", NULL};
+    const char* const keywords[] = { "name", "severity", "debuglevel", "file",
+                                     "buffer", NULL };
     if (!PyArg_ParseTupleAndKeywords(args, arg_keywords, "s|sizb",
                                      const_cast<char**>(keywords), &root,
-                                     &severity, &dbglevel, &file,
-                                     &buffer)) {
+                                     &severity, &dbglevel, &file, &buffer)) {
         return (NULL);
     }