Browse Source

[3113_test] Add library initialization function

Added initialization function that should be called when a
library is called by a statically-linked BIND 10.
Stephen Morris 11 years ago
parent
commit
390b118ab5

+ 1 - 2
src/lib/hooks/hooks.cc

@@ -13,7 +13,6 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <hooks/hooks.h>
-#include <log/message_dictionary.h>
 #include <log/message_initializer.h>
 
 
@@ -23,7 +22,7 @@ namespace hooks {
 // Load the logging message dictionary if not already loaded
 
 void
-hooks_static_link_init() {
+hooksStaticLinkInit() {
     isc::log::MessageInitializer::loadDictionary();
 }
 

+ 1 - 1
src/lib/hooks/hooks.h

@@ -69,7 +69,7 @@ namespace hooks {
 /// loading multiple user libraries may involve loading one message dictionary
 /// per library.
 
-void hooks_static_link_init();
+void hooksStaticLinkInit();
 
 } // namespace hooks
 } // namespace isc

+ 1 - 1
src/lib/hooks/tests/basic_callout_library.cc

@@ -115,7 +115,7 @@ version() {
 int
 load(isc::hooks::LibraryHandle&) {
 #ifdef USE_STATIC_LINK
-    hooks_static_link_init();
+    hooksStaticLinkInit();
 #endif
     return (0);
 }

+ 1 - 1
src/lib/hooks/tests/full_callout_library.cc

@@ -118,7 +118,7 @@ int
 load(LibraryHandle& handle) {
     // Initialize if the main image was statically linked
 #ifdef USE_STATIC_LINK
-    isc::hooks::hooks_static_link_init();
+    hooksStaticLinkInit();
 #endif
     // Register the non-standard functions
     handle.registerCallout("hookpt_two", hook_nonstandard_two);

+ 1 - 1
src/lib/hooks/tests/load_callout_library.cc

@@ -110,7 +110,7 @@ version() {
 int load(LibraryHandle& handle) {
     // Initialize the user library if the main image was statically linked
 #ifdef USE_STATIC_LINK
-    isc::hooks::hooks_static_link_init();
+    hooksStaticLinkInit();
 #endif
     // Register the non-standard functions
     handle.registerCallout("hookpt_two", hook_nonstandard_two);