diff --git a/src/lib/asiodns/tcp_server.cc b/src/lib/asiodns/tcp_server.cc index 00536f3bf6..e4bef74e79 100644 --- a/src/lib/asiodns/tcp_server.cc +++ b/src/lib/asiodns/tcp_server.cc @@ -14,8 +14,6 @@ #include -#include - #include #include diff --git a/src/lib/asiodns/udp_server.cc b/src/lib/asiodns/udp_server.cc index 72212969cd..9175d1e95e 100644 --- a/src/lib/asiodns/udp_server.cc +++ b/src/lib/asiodns/udp_server.cc @@ -21,8 +21,6 @@ #include -#include - #include #include #include @@ -35,7 +33,6 @@ using namespace asio; using asio::ip::udp; -using isc::log::dlog; using namespace std; using namespace isc::dns; diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h index 6b0a43cd49..7df4a80c9e 100644 --- a/src/lib/asiolink/tcp_socket.h +++ b/src/lib/asiolink/tcp_socket.h @@ -19,7 +19,6 @@ #error "asio.hpp must be included before including this, see asiolink.h as to why" #endif -#include #include #include #include // for some IPC/network system calls diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h index 5712957c23..4ac49c996d 100644 --- a/src/lib/asiolink/udp_socket.h +++ b/src/lib/asiolink/udp_socket.h @@ -19,7 +19,6 @@ #error "asio.hpp must be included before including this, see asiolink.h as to why" #endif -#include #include #include #include // for some IPC/network system calls diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am index cc00bebc24..6056fb5f57 100644 --- a/src/lib/log/Makefile.am +++ b/src/lib/log/Makefile.am @@ -8,7 +8,6 @@ CLEANFILES = *.gcno *.gcda lib_LTLIBRARIES = libb10-log.la libb10_log_la_SOURCES = -libb10_log_la_SOURCES += dummylog.h dummylog.cc libb10_log_la_SOURCES += logimpl_messages.cc logimpl_messages.h libb10_log_la_SOURCES += log_dbglevels.h libb10_log_la_SOURCES += log_formatter.h log_formatter.cc diff --git a/src/lib/log/dummylog.cc b/src/lib/log/dummylog.cc deleted file mode 100644 index 5f025e117e..0000000000 --- a/src/lib/log/dummylog.cc +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (C) 2010 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 "dummylog.h" - -#include - -using namespace std; - -namespace isc { -namespace log { - -bool denabled = false; -string dprefix; - -void dlog(const string& message,bool error_flag) { - if (denabled || error_flag) { - if (!dprefix.empty()) { - cerr << "[" << dprefix << "] "; - } - cerr << message << endl; - } -} - -} -} diff --git a/src/lib/log/dummylog.h b/src/lib/log/dummylog.h deleted file mode 100644 index 6f6ae970b7..0000000000 --- a/src/lib/log/dummylog.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2010 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. - -#ifndef ISC_DUMMYLOG_H -#define ISC_DUMMYLOG_H 1 - -#include - -namespace isc { -namespace log { - -/// Are we doing logging? -extern bool denabled; -/** - * \short Prefix into logs. - * - * The prefix is printed in front of every log message in square brackets. - * The usual convention is to put the name of program here. - */ -extern std::string dprefix; - -/** - * \short Temporary interface to logging. - * - * This is a temporary function to do logging. It has wrong interface currently - * and should be replaced by something else. Its main purpose now is to mark - * places where logging should happen. When it is removed, compiler will do - * our work of finding the places. - * - * The only thing it does is printing the program prefix, message and - * a newline if denabled is true. - * - * There are no tests for this function, since it is only temporary and - * trivial. Tests will be written for the real logging framework when it is - * created. - * - * It has the d in front of the name so it is unlikely anyone will create - * a real logging function with the same name and the place wouldn't be found - * as a compilation error. - * - * @param message The message to log. The real interface will probably have - * more parameters. - * \param error_flag TODO - */ -void dlog(const std::string& message, bool error_flag=false); - -} -} - -#endif // ISC_DUMMYLOG_H