BIND 10 trac1292_2, updated. 75fc5817606b892c8eeb4964dc2f3d2f044f5491 [1292] trivial editorial/style fixes

[BIND 10 source code commits]

The branch, trac1292_2 has been updated
       via  75fc5817606b892c8eeb4964dc2f3d2f044f5491 (commit)
      from  3e1a6afcabbef24f9501d8f4e3ed27d824db4309 (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 75fc5817606b892c8eeb4964dc2f3d2f044f5491
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Nov 23 17:11:47 2011 -0800

    [1292] trivial editorial/style fixes

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

Summary of changes:
 src/lib/datasrc/factory.cc        |   10 +++++-----
 src/lib/datasrc/tests/Makefile.am |    1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/factory.cc b/src/lib/datasrc/factory.cc
index b8f5353..a55fd15 100644
--- a/src/lib/datasrc/factory.cc
+++ b/src/lib/datasrc/factory.cc
@@ -36,7 +36,8 @@ namespace {
 // I.e. it will add '_ds.so' (if necessary), and prepend
 // it with an absolute path (if necessary).
 // Returns the resulting string to use with LibraryContainer.
-const std::string getDataSourceLibFile(std::string type) {
+const std::string
+getDataSourceLibFile(const std::string& type) {
     std::string lib_file = type;
     if (type.length() == 0) {
         isc_throw(DataSourceError,
@@ -46,8 +47,7 @@ const std::string getDataSourceLibFile(std::string type) {
     // Type can be either a short name, in which case we need to
     // append "_ds.so", or it can be a direct .so module.
     const int ext_pos = lib_file.rfind(".so");
-    if (ext_pos == std::string::npos ||
-        ext_pos + 3 != lib_file.length()) {
+    if (ext_pos == std::string::npos || ext_pos + 3 != lib_file.length()) {
         lib_file.append("_ds.so");
     }
     // And if it is not an absolute path, prepend it with our
@@ -55,14 +55,14 @@ const std::string getDataSourceLibFile(std::string type) {
     if (type[0] != '/') {
         // When running from the build tree, we do NOT want
         // to load the installed module
-        if (getenv("B10_FROM_BUILD")) {
+        if (getenv("B10_FROM_BUILD") != NULL) {
             lib_file = std::string(getenv("B10_FROM_BUILD")) +
                        "/src/lib/datasrc/.libs/" + lib_file;
         } else {
             lib_file = MODULE_PATH + lib_file;
         }
     }
-    return lib_file;
+    return (lib_file);
 }
 } // end anonymous namespace
 
diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index fb6d43f..f388845 100644
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -124,4 +124,3 @@ run_unittests_factory_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)
 run_unittests_factory_LDADD = $(common_ldadd)
 check-local:
 	B10_FROM_BUILD=${abs_top_builddir} ./run_unittests_factory
-