[2980] Updated as a result of the second part of the review.

src/lib/hooks/callout_manager.cc

@@ -38,11 +38,11 @@ CalloutManager::checkLibraryIndex(int library_index) const {
     if (((library_index >= -1) && (library_index <= num_libraries_)) ||
         (library_index == INT_MAX)) {
         return;
-    } else {
-        isc_throw(NoSuchLibrary, "library index " << library_index <<
-                  " is not valid for the number of loaded libraries (" <<
-                  num_libraries_ << ")");
     }
+
+    isc_throw(NoSuchLibrary, "library index " << library_index <<
+              " is not valid for the number of loaded libraries (" <<
+              num_libraries_ << ")");
 }
 
 // Set the number of libraries handled by the CalloutManager.

src/lib/hooks/callout_manager.h

@@ -41,7 +41,8 @@ public:
 /// @brief Callout Manager
 ///
 /// This class manages the registration, deregistration and execution of the
-/// library callouts.
+/// library callouts.  It is part of the hooks framework used by the BIND 10
+/// server, and is not for use by user-written code in a hooks library.
 ///
 /// In operation, the class needs to know two items of data:
 ///
@@ -377,7 +378,7 @@ private:
     /// Vector of callout vectors.  There is one entry in this outer vector for
     /// each hook. Each element is itself a vector, with one entry for each
     /// callout registered for that hook.
-    std::vector<CalloutVector>  hook_vector_;
+    std::vector<CalloutVector> hook_vector_;
 
     /// LibraryHandle object user by the callout to access the callout
     /// registration methods on this CalloutManager object.  The object is set