From: Francis Dupont <fdupont@isc.org>
Date: Fri, 18 Sep 2015 18:21:29 +0000 (+0200)
Subject: [4004] Moved hooksStaticLinkInit() definition
X-Git-Tag: trac4074_base~4^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d8f21453a10ee85385dc4f5da2be04c5cdd569d;p=thirdparty%2Fkea.git

[4004] Moved hooksStaticLinkInit() definition
---

diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index 704a4fc813..66cc19de72 100644
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -40,7 +40,6 @@ lib_LTLIBRARIES = libkea-hooks.la
 libkea_hooks_la_SOURCES  =
 libkea_hooks_la_SOURCES += callout_handle.cc callout_handle.h
 libkea_hooks_la_SOURCES += callout_manager.cc callout_manager.h
-libkea_hooks_la_SOURCES += hooks.h hooks.cc
 libkea_hooks_la_SOURCES += hooks_log.cc hooks_log.h
 libkea_hooks_la_SOURCES += hooks_manager.cc hooks_manager.h
 libkea_hooks_la_SOURCES += library_handle.cc library_handle.h
diff --git a/src/lib/hooks/hooks.cc b/src/lib/hooks/hooks.cc
deleted file mode 100644
index ed108dac98..0000000000
--- a/src/lib/hooks/hooks.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include <config.h>
-
-#include <hooks/hooks.h>
-#include <log/logger_support.h>
-
-#include <string>
-
-
-namespace isc {
-namespace hooks {
-
-// Load the logging message dictionary if not already loaded
-
-void
-hooksStaticLinkInit() {
-    if (!isc::log::isLoggingInitialized()) {
-        isc::log::initLogger(std::string("userlib"));
-    }
-}
-
-} // namespace hooks
-} // namespace isc
diff --git a/src/lib/hooks/library_manager.cc b/src/lib/hooks/library_manager.cc
index 1cbb7bcaf0..059b1a4b5c 100644
--- a/src/lib/hooks/library_manager.cc
+++ b/src/lib/hooks/library_manager.cc
@@ -23,6 +23,7 @@
 #include <hooks/pointer_converter.h>
 #include <hooks/server_hooks.h>
 #include <log/logger_manager.h>
+#include <log/logger_support.h>
 #include <log/message_initializer.h>
 
 #include <string>
@@ -375,5 +376,13 @@ LibraryManager::validateLibrary(const std::string& name) {
     return (validated);
 }
 
+// @note Moved from its own hooks.cc file to avoid undefined reference
+// with static link.
+void hooksStaticLinkInit() {
+    if (!isc::log::isLoggingInitialized()) {
+        isc::log::initLogger(std::string("userlib"));
+    }
+}
+
 } // namespace hooks
 } // namespace isc