From: Stephen Morris Date: Mon, 15 Jul 2013 13:58:57 +0000 (+0100) Subject: [3054] Removed redundant method declaration X-Git-Tag: bind10-1.2.0beta1-release~329^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e13f44e871bde3f44ffc080a1996149d61fc13d;p=thirdparty%2Fkea.git [3054] Removed redundant method declaration --- diff --git a/src/lib/hooks/hooks_manager.h b/src/lib/hooks/hooks_manager.h index 75374a9756..ed33d4d8da 100644 --- a/src/lib/hooks/hooks_manager.h +++ b/src/lib/hooks/hooks_manager.h @@ -49,27 +49,6 @@ public: /// @return Reference to the singleton hooks manager. static HooksManager& getHooksManager(); - /// @brief Validate library list - /// - /// For each library passed to it, checks that the library can be opened - /// and that the "version" function is present and gives the right answer. - /// Each library is closed afterwards. - /// - /// This is used during the configuration parsing - when the list of hooks - /// libraries is changed, each of the new libraries is checked before the - /// change is committed. - /// - /// @param List of libraries to be validated. - /// - /// @return An empty string if all libraries validated. Otherwise it is - /// the names of the libraries that failed validation, separated - /// by a command and a space. The configuration code can return - /// this to bindctl as an indication of the problem. (Note that - /// validation failures are logged, so more information can be - /// obtained if necessary.) - static std::string validateLibraries( - const std::vector& libraries); - /// @brief Load and reload libraries /// /// Loads the list of libraries into the server address space. For each @@ -199,22 +178,26 @@ public: /// @return List of loaded library names. static std::vector getLibraryNames(); - /// @brief Validate set of libraries + /// @brief Validate library list /// - /// Validates the names of the libraries passed to it. The function checks - /// that the libraries exist, that they contain a "version" function and - /// that it returns the right value. + /// For each library passed to it, checks that the library can be opened + /// and that the "version" function is present and gives the right answer. + /// Each library is closed afterwards. /// - /// This is really just a wrapper around the LibraryManagerCollection - /// static method of the same name, and is supplied so that the server - /// does not have to know about that object. + /// This is used during the configuration parsing - when the list of hooks + /// libraries is changed, each of the new libraries is checked before the + /// change is committed. /// - /// @param libraries Names of the libraries to validate + /// @param List of libraries to be validated. /// - /// @return Comma-separated list of libraries that failed to validate, - /// empty string if not. (Actually, if the list of failures is - /// more than one, each item is separated by a command and a space.) - static std::string validateLibraries(); + /// @return An empty string if all libraries validated. Otherwise it is + /// the names of the libraries that failed validation, separated + /// by a command and a space. The configuration code can return + /// this to bindctl as an indication of the problem. (Note that + /// validation failures are logged, so more information can be + /// obtained if necessary.) + static std::string validateLibraries( + const std::vector& libraries); /// Index numbers for pre-defined hooks. static const int CONTEXT_CREATE = ServerHooks::CONTEXT_CREATE;