From ac155d1ddac3d2cf8a80df4125690039a562ecee Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 04:25:35 +0100 Subject: [PATCH 01/12] Apply clang-tidy fix 'modernize-redundant-void-arg' --- icinga-app/icinga.cpp | 2 +- icinga-studio/connectform.cpp | 2 +- icinga-studio/connectform.hpp | 2 +- icinga-studio/icinga-studio.cpp | 2 +- lib/base/application-version.cpp | 4 +- lib/base/application.cpp | 94 +++++++++---------- lib/base/application.hpp | 102 ++++++++++----------- lib/base/array-script.cpp | 12 +-- lib/base/array.cpp | 22 ++--- lib/base/array.hpp | 26 +++--- lib/base/boolean-script.cpp | 4 +- lib/base/boolean.hpp | 4 +- lib/base/configobject-script.cpp | 2 +- lib/base/configobject.cpp | 30 +++--- lib/base/configobject.hpp | 32 +++---- lib/base/configobject.ti | 4 +- lib/base/configtype.cpp | 6 +- lib/base/configtype.hpp | 10 +- lib/base/configwriter.cpp | 4 +- lib/base/configwriter.hpp | 6 +- lib/base/console.cpp | 2 +- lib/base/console.hpp | 4 +- lib/base/context.cpp | 8 +- lib/base/context.hpp | 8 +- lib/base/convert.hpp | 2 +- lib/base/datetime-script.cpp | 2 +- lib/base/datetime.cpp | 4 +- lib/base/datetime.hpp | 6 +- lib/base/debuginfo.cpp | 2 +- lib/base/debuginfo.hpp | 2 +- lib/base/dependencygraph.hpp | 2 +- lib/base/dictionary-script.cpp | 10 +- lib/base/dictionary.cpp | 20 ++-- lib/base/dictionary.hpp | 22 ++--- lib/base/exception.cpp | 34 +++---- lib/base/exception.hpp | 28 +++--- lib/base/fifo.cpp | 16 ++-- lib/base/fifo.hpp | 16 ++-- lib/base/filelogger.cpp | 2 +- lib/base/filelogger.hpp | 2 +- lib/base/function-script.cpp | 2 +- lib/base/function.cpp | 2 +- lib/base/function.hpp | 8 +- lib/base/initialize.cpp | 2 +- lib/base/initialize.hpp | 2 +- lib/base/json.cpp | 10 +- lib/base/library.hpp | 2 +- lib/base/loader.cpp | 6 +- lib/base/loader.hpp | 14 +-- lib/base/logger.cpp | 16 ++-- lib/base/logger.hpp | 20 ++-- lib/base/math-script.cpp | 2 +- lib/base/netstring.hpp | 2 +- lib/base/networkstream.cpp | 4 +- lib/base/networkstream.hpp | 4 +- lib/base/number-script.cpp | 4 +- lib/base/number.hpp | 4 +- lib/base/object-script.cpp | 6 +- lib/base/object.cpp | 14 +-- lib/base/object.hpp | 20 ++-- lib/base/objectlock.cpp | 8 +- lib/base/objectlock.hpp | 8 +- lib/base/objecttype.cpp | 12 +-- lib/base/objecttype.hpp | 12 +-- lib/base/perfdatavalue.cpp | 4 +- lib/base/perfdatavalue.hpp | 4 +- lib/base/primitivetype.cpp | 10 +- lib/base/primitivetype.hpp | 10 +- lib/base/process.cpp | 22 ++--- lib/base/process.hpp | 16 ++-- lib/base/registry.hpp | 4 +- lib/base/ringbuffer.cpp | 2 +- lib/base/ringbuffer.hpp | 2 +- lib/base/scriptframe.cpp | 14 +-- lib/base/scriptframe.hpp | 14 +-- lib/base/scriptglobal.cpp | 2 +- lib/base/scriptglobal.hpp | 2 +- lib/base/scriptutils.cpp | 2 +- lib/base/scriptutils.hpp | 4 +- lib/base/singleton.hpp | 2 +- lib/base/socket.cpp | 20 ++-- lib/base/socket.hpp | 20 ++-- lib/base/socketevents.cpp | 10 +- lib/base/socketevents.hpp | 14 +-- lib/base/stacktrace.cpp | 2 +- lib/base/stacktrace.hpp | 4 +- lib/base/stdiostream.cpp | 8 +- lib/base/stdiostream.hpp | 8 +- lib/base/stream.cpp | 12 +-- lib/base/stream.hpp | 16 ++-- lib/base/streamlogger.cpp | 8 +- lib/base/streamlogger.hpp | 10 +- lib/base/string-script.cpp | 14 +-- lib/base/string.cpp | 42 ++++----- lib/base/string.hpp | 44 ++++----- lib/base/sysloglogger.cpp | 6 +- lib/base/sysloglogger.hpp | 6 +- lib/base/threadpool.cpp | 8 +- lib/base/threadpool.hpp | 10 +- lib/base/timer.cpp | 22 ++--- lib/base/timer.hpp | 14 +-- lib/base/tlsstream.cpp | 26 +++--- lib/base/tlsstream.hpp | 26 +++--- lib/base/tlsutility.cpp | 6 +- lib/base/tlsutility.hpp | 4 +- lib/base/type.cpp | 26 +++--- lib/base/type.hpp | 38 ++++---- lib/base/typetype-script.cpp | 2 +- lib/base/unixsocket.cpp | 2 +- lib/base/unixsocket.hpp | 2 +- lib/base/utility.cpp | 30 +++--- lib/base/utility.hpp | 32 +++---- lib/base/value-operators.cpp | 4 +- lib/base/value.cpp | 34 +++---- lib/base/value.hpp | 44 ++++----- lib/base/workqueue.cpp | 20 ++-- lib/base/workqueue.hpp | 20 ++-- lib/checker/checkercomponent.cpp | 12 +-- lib/checker/checkercomponent.hpp | 16 ++-- lib/cli/apisetupcommand.cpp | 8 +- lib/cli/apisetupcommand.hpp | 8 +- lib/cli/apisetuputility.cpp | 6 +- lib/cli/apisetuputility.hpp | 8 +- lib/cli/calistcommand.cpp | 4 +- lib/cli/calistcommand.hpp | 4 +- lib/cli/casigncommand.cpp | 8 +- lib/cli/casigncommand.hpp | 8 +- lib/cli/clicommand.cpp | 14 +-- lib/cli/clicommand.hpp | 18 ++-- lib/cli/consolecommand.cpp | 10 +- lib/cli/consolecommand.hpp | 8 +- lib/cli/daemoncommand.cpp | 6 +- lib/cli/daemoncommand.hpp | 4 +- lib/cli/featuredisablecommand.cpp | 10 +- lib/cli/featuredisablecommand.hpp | 10 +- lib/cli/featureenablecommand.cpp | 10 +- lib/cli/featureenablecommand.hpp | 10 +- lib/cli/featurelistcommand.cpp | 4 +- lib/cli/featurelistcommand.hpp | 4 +- lib/cli/featureutility.cpp | 4 +- lib/cli/featureutility.hpp | 6 +- lib/cli/nodesetupcommand.cpp | 6 +- lib/cli/nodesetupcommand.hpp | 6 +- lib/cli/nodeutility.cpp | 2 +- lib/cli/nodeutility.hpp | 4 +- lib/cli/nodewizardcommand.cpp | 12 +-- lib/cli/nodewizardcommand.hpp | 12 +-- lib/cli/objectlistcommand.cpp | 4 +- lib/cli/objectlistcommand.hpp | 4 +- lib/cli/pkinewcacommand.cpp | 4 +- lib/cli/pkinewcacommand.hpp | 4 +- lib/cli/pkinewcertcommand.cpp | 4 +- lib/cli/pkinewcertcommand.hpp | 4 +- lib/cli/pkirequestcommand.cpp | 4 +- lib/cli/pkirequestcommand.hpp | 4 +- lib/cli/pkisavecertcommand.cpp | 4 +- lib/cli/pkisavecertcommand.hpp | 4 +- lib/cli/pkisigncsrcommand.cpp | 4 +- lib/cli/pkisigncsrcommand.hpp | 4 +- lib/cli/pkiticketcommand.cpp | 4 +- lib/cli/pkiticketcommand.hpp | 4 +- lib/cli/troubleshootcommand.cpp | 12 +-- lib/cli/troubleshootcommand.hpp | 6 +- lib/cli/variablegetcommand.cpp | 6 +- lib/cli/variablegetcommand.hpp | 6 +- lib/cli/variablelistcommand.cpp | 4 +- lib/cli/variablelistcommand.hpp | 4 +- lib/cli/variableutility.hpp | 2 +- lib/compat/checkresultreader.cpp | 2 +- lib/compat/checkresultreader.hpp | 2 +- lib/compat/compatlogger.cpp | 6 +- lib/compat/compatlogger.hpp | 6 +- lib/compat/statusdatawriter.cpp | 6 +- lib/compat/statusdatawriter.hpp | 6 +- lib/config/activationcontext.cpp | 10 +- lib/config/activationcontext.hpp | 10 +- lib/config/applyrule.cpp | 28 +++--- lib/config/applyrule.hpp | 28 +++--- lib/config/config_lexer.ll | 4 +- lib/config/config_parser.yy | 2 +- lib/config/configcompiler.cpp | 10 +- lib/config/configcompiler.hpp | 18 ++-- lib/config/configcompilercontext.cpp | 8 +- lib/config/configcompilercontext.hpp | 8 +- lib/config/configitem.cpp | 24 ++--- lib/config/configitem.hpp | 26 +++--- lib/config/configitembuilder.cpp | 4 +- lib/config/configitembuilder.hpp | 4 +- lib/config/expression.cpp | 8 +- lib/config/expression.hpp | 28 +++--- lib/config/objectrule.hpp | 2 +- lib/db_ido/commanddbobject.cpp | 4 +- lib/db_ido/commanddbobject.hpp | 4 +- lib/db_ido/dbconnection.cpp | 28 +++--- lib/db_ido/dbconnection.hpp | 32 +++---- lib/db_ido/dbevents.cpp | 2 +- lib/db_ido/dbevents.hpp | 4 +- lib/db_ido/dbobject.cpp | 30 +++--- lib/db_ido/dbobject.hpp | 34 +++---- lib/db_ido/dbquery.cpp | 4 +- lib/db_ido/dbquery.hpp | 6 +- lib/db_ido/dbreference.cpp | 6 +- lib/db_ido/dbreference.hpp | 6 +- lib/db_ido/dbtype.cpp | 16 ++-- lib/db_ido/dbtype.hpp | 16 ++-- lib/db_ido/dbvalue.cpp | 6 +- lib/db_ido/dbvalue.hpp | 6 +- lib/db_ido/endpointdbobject.cpp | 6 +- lib/db_ido/endpointdbobject.hpp | 6 +- lib/db_ido/hostdbobject.cpp | 10 +- lib/db_ido/hostdbobject.hpp | 10 +- lib/db_ido/hostgroupdbobject.cpp | 4 +- lib/db_ido/hostgroupdbobject.hpp | 4 +- lib/db_ido/idochecktask.hpp | 2 +- lib/db_ido/servicedbobject.cpp | 10 +- lib/db_ido/servicedbobject.hpp | 12 +-- lib/db_ido/servicegroupdbobject.cpp | 4 +- lib/db_ido/servicegroupdbobject.hpp | 4 +- lib/db_ido/timeperioddbobject.cpp | 6 +- lib/db_ido/timeperioddbobject.hpp | 6 +- lib/db_ido/userdbobject.cpp | 6 +- lib/db_ido/userdbobject.hpp | 6 +- lib/db_ido/usergroupdbobject.cpp | 4 +- lib/db_ido/usergroupdbobject.hpp | 4 +- lib/db_ido/zonedbobject.cpp | 4 +- lib/db_ido/zonedbobject.hpp | 4 +- lib/db_ido_mysql/idomysqlconnection.cpp | 32 +++---- lib/db_ido_mysql/idomysqlconnection.hpp | 32 +++---- lib/db_ido_pgsql/idopgsqlconnection.cpp | 28 +++--- lib/db_ido_pgsql/idopgsqlconnection.hpp | 30 +++--- lib/demo/demo.cpp | 2 +- lib/demo/demo.hpp | 2 +- lib/hello/helloapplication.cpp | 2 +- lib/hello/helloapplication.hpp | 2 +- lib/icinga/apievents.cpp | 2 +- lib/icinga/apievents.hpp | 2 +- lib/icinga/checkable-check.cpp | 18 ++-- lib/icinga/checkable-comment.cpp | 4 +- lib/icinga/checkable-dependency.cpp | 10 +- lib/icinga/checkable-downtime.cpp | 10 +- lib/icinga/checkable-event.cpp | 2 +- lib/icinga/checkable-flapping.cpp | 2 +- lib/icinga/checkable-notification.cpp | 4 +- lib/icinga/checkable-script.cpp | 2 +- lib/icinga/checkable.cpp | 14 +-- lib/icinga/checkable.hpp | 64 ++++++------- lib/icinga/checkresult.cpp | 4 +- lib/icinga/checkresult.hpp | 4 +- lib/icinga/cib.cpp | 10 +- lib/icinga/cib.hpp | 12 +-- lib/icinga/clusterevents.cpp | 2 +- lib/icinga/clusterevents.hpp | 2 +- lib/icinga/comment.cpp | 10 +- lib/icinga/comment.hpp | 10 +- lib/icinga/compatutility.hpp | 2 +- lib/icinga/dependency.cpp | 10 +- lib/icinga/dependency.hpp | 10 +- lib/icinga/downtime.cpp | 22 ++--- lib/icinga/downtime.hpp | 22 ++--- lib/icinga/externalcommandprocessor.cpp | 6 +- lib/icinga/externalcommandprocessor.hpp | 8 +- lib/icinga/host.cpp | 14 +-- lib/icinga/host.hpp | 16 ++-- lib/icinga/hostgroup.cpp | 2 +- lib/icinga/hostgroup.hpp | 2 +- lib/icinga/icingaapplication.cpp | 14 +-- lib/icinga/icingaapplication.hpp | 16 ++-- lib/icinga/legacytimeperiod.hpp | 2 +- lib/icinga/macroprocessor.cpp | 2 +- lib/icinga/macroprocessor.hpp | 2 +- lib/icinga/notification.cpp | 26 +++--- lib/icinga/notification.hpp | 26 +++--- lib/icinga/objectutils.hpp | 2 +- lib/icinga/pluginutility.hpp | 2 +- lib/icinga/scheduleddowntime.cpp | 10 +- lib/icinga/scheduleddowntime.hpp | 10 +- lib/icinga/service.cpp | 6 +- lib/icinga/service.hpp | 6 +- lib/icinga/servicegroup.cpp | 2 +- lib/icinga/servicegroup.hpp | 2 +- lib/icinga/timeperiod.cpp | 6 +- lib/icinga/timeperiod.hpp | 6 +- lib/icinga/user.cpp | 6 +- lib/icinga/user.hpp | 6 +- lib/icinga/usergroup.cpp | 2 +- lib/icinga/usergroup.hpp | 2 +- lib/livestatus/aggregator.cpp | 6 +- lib/livestatus/aggregator.hpp | 6 +- lib/livestatus/andfilter.cpp | 2 +- lib/livestatus/andfilter.hpp | 2 +- lib/livestatus/avgaggregator.hpp | 2 +- lib/livestatus/combinerfilter.cpp | 2 +- lib/livestatus/combinerfilter.hpp | 2 +- lib/livestatus/commandstable.cpp | 6 +- lib/livestatus/commandstable.hpp | 6 +- lib/livestatus/commentstable.cpp | 6 +- lib/livestatus/commentstable.hpp | 6 +- lib/livestatus/contactgroupstable.cpp | 6 +- lib/livestatus/contactgroupstable.hpp | 6 +- lib/livestatus/contactstable.cpp | 6 +- lib/livestatus/contactstable.hpp | 6 +- lib/livestatus/countaggregator.hpp | 2 +- lib/livestatus/downtimestable.cpp | 6 +- lib/livestatus/downtimestable.hpp | 6 +- lib/livestatus/endpointstable.cpp | 6 +- lib/livestatus/endpointstable.hpp | 6 +- lib/livestatus/filter.hpp | 3 + lib/livestatus/hostgroupstable.cpp | 6 +- lib/livestatus/hostgroupstable.hpp | 6 +- lib/livestatus/hoststable.cpp | 4 +- lib/livestatus/hoststable.hpp | 4 +- lib/livestatus/invavgaggregator.hpp | 2 +- lib/livestatus/invsumaggregator.hpp | 2 +- lib/livestatus/livestatuslistener.cpp | 6 +- lib/livestatus/livestatuslistener.hpp | 6 +- lib/livestatus/livestatuslogutility.hpp | 2 +- lib/livestatus/livestatusquery.cpp | 2 +- lib/livestatus/livestatusquery.hpp | 2 +- lib/livestatus/logtable.cpp | 4 +- lib/livestatus/logtable.hpp | 4 +- lib/livestatus/maxaggregator.hpp | 2 +- lib/livestatus/minaggregator.hpp | 2 +- lib/livestatus/orfilter.cpp | 2 +- lib/livestatus/orfilter.hpp | 2 +- lib/livestatus/servicegroupstable.cpp | 6 +- lib/livestatus/servicegroupstable.hpp | 6 +- lib/livestatus/servicestable.cpp | 4 +- lib/livestatus/servicestable.hpp | 4 +- lib/livestatus/statehisttable.cpp | 4 +- lib/livestatus/statehisttable.hpp | 4 +- lib/livestatus/statustable.cpp | 6 +- lib/livestatus/statustable.hpp | 6 +- lib/livestatus/stdaggregator.hpp | 2 +- lib/livestatus/sumaggregator.hpp | 2 +- lib/livestatus/table.cpp | 4 +- lib/livestatus/table.hpp | 8 +- lib/livestatus/timeperiodstable.cpp | 6 +- lib/livestatus/timeperiodstable.hpp | 6 +- lib/livestatus/zonestable.cpp | 6 +- lib/livestatus/zonestable.hpp | 6 +- lib/methods/clrchecktask.cpp | 2 +- lib/methods/clrchecktask.hpp | 2 +- lib/methods/clusterchecktask.hpp | 2 +- lib/methods/clusterzonechecktask.hpp | 2 +- lib/methods/dummychecktask.hpp | 2 +- lib/methods/exceptionchecktask.hpp | 2 +- lib/methods/icingachecktask.hpp | 2 +- lib/methods/nullchecktask.hpp | 2 +- lib/methods/nulleventtask.hpp | 2 +- lib/methods/pluginchecktask.hpp | 2 +- lib/methods/plugineventtask.hpp | 2 +- lib/methods/pluginnotificationtask.hpp | 2 +- lib/methods/randomchecktask.hpp | 2 +- lib/methods/timeperiodtask.hpp | 2 +- lib/mysql_shim/mysqlinterface.cpp | 6 +- lib/mysql_shim/mysqlinterface.hpp | 12 +-- lib/notification/notificationcomponent.cpp | 2 +- lib/notification/notificationcomponent.hpp | 2 +- lib/perfdata/elasticsearchwriter.cpp | 12 +-- lib/perfdata/elasticsearchwriter.hpp | 12 +-- lib/perfdata/gelfwriter.cpp | 12 +-- lib/perfdata/gelfwriter.hpp | 12 +-- lib/perfdata/graphitewriter.cpp | 12 +-- lib/perfdata/graphitewriter.hpp | 12 +-- lib/perfdata/influxdbwriter.cpp | 16 ++-- lib/perfdata/influxdbwriter.hpp | 12 +-- lib/perfdata/opentsdbwriter.cpp | 2 +- lib/perfdata/opentsdbwriter.hpp | 2 +- lib/perfdata/perfdatawriter.cpp | 2 +- lib/perfdata/perfdatawriter.hpp | 2 +- lib/pgsql_shim/pgsqlinterface.cpp | 6 +- lib/pgsql_shim/pgsqlinterface.hpp | 12 +-- lib/remote/apiaction.cpp | 4 +- lib/remote/apiaction.hpp | 4 +- lib/remote/apifunction.cpp | 2 +- lib/remote/apifunction.hpp | 2 +- lib/remote/apilistener-filesync.cpp | 2 +- lib/remote/apilistener.cpp | 50 +++++----- lib/remote/apilistener.hpp | 54 +++++------ lib/remote/authority.cpp | 2 +- lib/remote/configobjectutility.cpp | 2 +- lib/remote/configobjectutility.hpp | 2 +- lib/remote/configpackageutility.cpp | 6 +- lib/remote/configpackageutility.hpp | 6 +- lib/remote/consolehandler.cpp | 4 +- lib/remote/consolehandler.hpp | 2 +- lib/remote/endpoint.cpp | 20 ++-- lib/remote/endpoint.hpp | 20 ++-- lib/remote/eventqueue.cpp | 2 +- lib/remote/eventqueue.hpp | 2 +- lib/remote/httpclientconnection.cpp | 18 ++-- lib/remote/httpclientconnection.hpp | 18 ++-- lib/remote/httprequest.cpp | 4 +- lib/remote/httprequest.hpp | 4 +- lib/remote/httpresponse.cpp | 8 +- lib/remote/httpresponse.hpp | 8 +- lib/remote/httpserverconnection.cpp | 18 ++-- lib/remote/httpserverconnection.hpp | 20 ++-- lib/remote/jsonrpc.cpp | 2 +- lib/remote/jsonrpc.hpp | 2 +- lib/remote/jsonrpcconnection-heartbeat.cpp | 2 +- lib/remote/jsonrpcconnection.cpp | 32 +++---- lib/remote/jsonrpcconnection.hpp | 34 +++---- lib/remote/messageorigin.cpp | 2 +- lib/remote/messageorigin.hpp | 2 +- lib/remote/pkiutility.cpp | 4 +- lib/remote/pkiutility.hpp | 6 +- lib/remote/url.cpp | 18 ++-- lib/remote/url.hpp | 18 ++-- lib/remote/zone.cpp | 14 +-- lib/remote/zone.hpp | 14 +-- test/base-object.cpp | 2 +- test/icinga-checkable-fixture.cpp | 4 +- test/icinga-legacytimeperiod.cpp | 4 +- test/livestatus-fixture.cpp | 4 +- test/test-runner.cpp | 2 +- tools/mkclass/class_parser.yy | 2 +- tools/mkclass/classcompiler.cpp | 62 ++++++------- tools/mkclass/classcompiler.hpp | 24 ++--- 419 files changed, 1960 insertions(+), 1957 deletions(-) diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp index e92b97aa5..b603a2ce4 100644 --- a/icinga-app/icinga.cpp +++ b/icinga-app/icinga.cpp @@ -93,7 +93,7 @@ static std::vector GlobalArgumentCompletion(const String& argument, cons return std::vector(); } -static int Main(void) +static int Main() { int argc = Application::GetArgC(); char **argv = Application::GetArgV(); diff --git a/icinga-studio/connectform.cpp b/icinga-studio/connectform.cpp index 27b617b28..b3d20d5fb 100644 --- a/icinga-studio/connectform.cpp +++ b/icinga-studio/connectform.cpp @@ -56,7 +56,7 @@ ConnectForm::ConnectForm(wxWindow *parent, const Url::Ptr& url) SetDefaultItem(m_ButtonsOK); } -Url::Ptr ConnectForm::GetUrl(void) const +Url::Ptr ConnectForm::GetUrl() const { wxString url = "https://" + m_UserText->GetValue() + ":" + m_PasswordText->GetValue() + "@" + m_HostText->GetValue() + ":" + m_PortText->GetValue() + "/"; diff --git a/icinga-studio/connectform.hpp b/icinga-studio/connectform.hpp index 3820e7d66..ca54502fa 100644 --- a/icinga-studio/connectform.hpp +++ b/icinga-studio/connectform.hpp @@ -31,7 +31,7 @@ class ConnectForm final : public ConnectFormBase public: ConnectForm(wxWindow *parent, const Url::Ptr& url); - Url::Ptr GetUrl(void) const; + Url::Ptr GetUrl() const; }; } diff --git a/icinga-studio/icinga-studio.cpp b/icinga-studio/icinga-studio.cpp index 913fcde27..e15ebbd26 100644 --- a/icinga-studio/icinga-studio.cpp +++ b/icinga-studio/icinga-studio.cpp @@ -29,7 +29,7 @@ using namespace icinga; class IcingaStudio final : public wxApp { public: - virtual bool OnInit(void) override + virtual bool OnInit() override { Application::InitializeBase(); diff --git a/lib/base/application-version.cpp b/lib/base/application-version.cpp index ae2f25f5a..0bb642519 100644 --- a/lib/base/application-version.cpp +++ b/lib/base/application-version.cpp @@ -23,12 +23,12 @@ using namespace icinga; -String Application::GetAppVersion(void) +String Application::GetAppVersion() { return VERSION; } -String Application::GetAppSpecVersion(void) +String Application::GetAppSpecVersion() { return SPEC_VERSION; } diff --git a/lib/base/application.cpp b/lib/base/application.cpp index 8feb38233..d135592a1 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -53,7 +53,7 @@ using namespace icinga; REGISTER_TYPE(Application); -boost::signals2::signal Application::OnReopenLogs; +boost::signals2::signal Application::OnReopenLogs; Application::Ptr Application::m_Instance = nullptr; bool Application::m_ShuttingDown = false; bool Application::m_RequestRestart = false; @@ -71,7 +71,7 @@ double Application::m_LastReloadFailed; /** * Constructor for the Application class. */ -void Application::OnConfigLoaded(void) +void Application::OnConfigLoaded() { m_PidFile = nullptr; @@ -113,7 +113,7 @@ void Application::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -Application::~Application(void) +Application::~Application() { m_Instance = nullptr; } @@ -135,7 +135,7 @@ void Application::Exit(int rc) #endif /* I2_DEBUG */ } -void Application::InitializeBase(void) +void Application::InitializeBase() { #ifdef _WIN32 /* disable GUI-based error messages for LoadLibrary() */ @@ -160,7 +160,7 @@ void Application::InitializeBase(void) GetTP().Start(); } -void Application::UninitializeBase(void) +void Application::UninitializeBase() { Timer::Uninitialize(); @@ -172,12 +172,12 @@ void Application::UninitializeBase(void) * * @returns The application object. */ -Application::Ptr Application::GetInstance(void) +Application::Ptr Application::GetInstance() { return m_Instance; } -void Application::SetResourceLimits(void) +void Application::SetResourceLimits() { #ifdef __linux__ rlimit rl; @@ -289,7 +289,7 @@ void Application::SetResourceLimits(void) #endif /* __linux__ */ } -int Application::GetArgC(void) +int Application::GetArgC() { return m_ArgC; } @@ -299,7 +299,7 @@ void Application::SetArgC(int argc) m_ArgC = argc; } -char **Application::GetArgV(void) +char **Application::GetArgV() { return m_ArgV; } @@ -313,7 +313,7 @@ void Application::SetArgV(char **argv) * Processes events for registered sockets and timers and calls whatever * handlers have been set up for these events. */ -void Application::RunEventLoop(void) +void Application::RunEventLoop() { double lastLoop = Utility::GetTime(); @@ -365,12 +365,12 @@ mainloop: UninitializeBase(); } -bool Application::IsShuttingDown(void) +bool Application::IsShuttingDown() { return m_ShuttingDown; } -void Application::OnShutdown(void) +void Application::OnShutdown() { /* Nothing to do here. */ } @@ -395,7 +395,7 @@ static void ReloadProcessCallback(const ProcessResult& pr) t.detach(); } -pid_t Application::StartReloadProcess(void) +pid_t Application::StartReloadProcess() { Log(LogInformation, "Application", "Got reload command: Starting new instance."); @@ -428,7 +428,7 @@ pid_t Application::StartReloadProcess(void) * Signals the application to shut down during the next * execution of the event loop. */ -void Application::RequestShutdown(void) +void Application::RequestShutdown() { Log(LogInformation, "Application", "Received request to shut down."); @@ -439,7 +439,7 @@ void Application::RequestShutdown(void) * Signals the application to restart during the next * execution of the event loop. */ -void Application::RequestRestart(void) +void Application::RequestRestart() { m_RequestRestart = true; } @@ -448,7 +448,7 @@ void Application::RequestRestart(void) * Signals the application to reopen log files during the * next execution of the event loop. */ -void Application::RequestReopenLogs(void) +void Application::RequestReopenLogs() { m_RequestReopenLogs = true; } @@ -577,7 +577,7 @@ void Application::DisplayBugMessage(std::ostream& os) << "***" << "\n"; } -String Application::GetCrashReportFilename(void) +String Application::GetCrashReportFilename() { return GetLocalStateDir() + "/log/icinga2/crash/report." + Convert::ToString(Utility::GetTime()); } @@ -787,7 +787,7 @@ BOOL WINAPI Application::CtrlHandler(DWORD type) return TRUE; } -bool Application::IsProcessElevated(void) { +bool Application::IsProcessElevated() { BOOL fIsElevated = FALSE; DWORD dwError = ERROR_SUCCESS; HANDLE hToken = nullptr; @@ -825,7 +825,7 @@ bool Application::IsProcessElevated(void) { /** * Handler for unhandled exceptions. */ -void Application::ExceptionHandler(void) +void Application::ExceptionHandler() { if (l_InExceptionHandler) for (;;) @@ -934,7 +934,7 @@ LONG CALLBACK Application::SEHUnhandledExceptionFilter(PEXCEPTION_POINTERS exi) /** * Installs the exception handlers. */ -void Application::InstallExceptionHandlers(void) +void Application::InstallExceptionHandlers() { std::set_terminate(&Application::ExceptionHandler); @@ -953,7 +953,7 @@ void Application::InstallExceptionHandlers(void) * * @returns The application's exit code. */ -int Application::Run(void) +int Application::Run() { #ifndef _WIN32 struct sigaction sa; @@ -1123,7 +1123,7 @@ pid_t Application::ReadPidFile(const String& filename) * * @returns The path. */ -String Application::GetPrefixDir(void) +String Application::GetPrefixDir() { return ScriptGlobal::Get("PrefixDir"); } @@ -1144,7 +1144,7 @@ void Application::DeclarePrefixDir(const String& path) * * @returns The path. */ -String Application::GetSysconfDir(void) +String Application::GetSysconfDir() { return ScriptGlobal::Get("SysconfDir"); } @@ -1165,7 +1165,7 @@ void Application::DeclareSysconfDir(const String& path) * * @returns The path. */ -String Application::GetRunDir(void) +String Application::GetRunDir() { return ScriptGlobal::Get("RunDir"); } @@ -1186,7 +1186,7 @@ void Application::DeclareRunDir(const String& path) * * @returns The path. */ -String Application::GetLocalStateDir(void) +String Application::GetLocalStateDir() { return ScriptGlobal::Get("LocalStateDir"); } @@ -1207,7 +1207,7 @@ void Application::DeclareLocalStateDir(const String& path) * * @returns The path. */ -String Application::GetZonesDir(void) +String Application::GetZonesDir() { return ScriptGlobal::Get("ZonesDir", &Empty); } @@ -1228,7 +1228,7 @@ void Application::DeclareZonesDir(const String& path) * * @returns The path. */ -String Application::GetPkgDataDir(void) +String Application::GetPkgDataDir() { String defaultValue = ""; return ScriptGlobal::Get("PkgDataDir", &Empty); @@ -1250,7 +1250,7 @@ void Application::DeclarePkgDataDir(const String& path) * * @returns The path. */ -String Application::GetIncludeConfDir(void) +String Application::GetIncludeConfDir() { return ScriptGlobal::Get("IncludeConfDir", &Empty); } @@ -1271,7 +1271,7 @@ void Application::DeclareIncludeConfDir(const String& path) * * @returns The path. */ -String Application::GetStatePath(void) +String Application::GetStatePath() { return ScriptGlobal::Get("StatePath", &Empty); } @@ -1292,7 +1292,7 @@ void Application::DeclareStatePath(const String& path) * * @returns The path. */ -String Application::GetModAttrPath(void) +String Application::GetModAttrPath() { return ScriptGlobal::Get("ModAttrPath", &Empty); } @@ -1313,7 +1313,7 @@ void Application::DeclareModAttrPath(const String& path) * * @returns The path. */ -String Application::GetObjectsPath(void) +String Application::GetObjectsPath() { return ScriptGlobal::Get("ObjectsPath", &Empty); } @@ -1334,7 +1334,7 @@ void Application::DeclareObjectsPath(const String& path) * * @returns The path. */ -String Application::GetVarsPath(void) +String Application::GetVarsPath() { return ScriptGlobal::Get("VarsPath", &Empty); } @@ -1355,7 +1355,7 @@ void Application::DeclareVarsPath(const String& path) * * @returns The path. */ -String Application::GetPidPath(void) +String Application::GetPidPath() { return ScriptGlobal::Get("PidPath", &Empty); } @@ -1376,7 +1376,7 @@ void Application::DeclarePidPath(const String& path) * * @returns The name. */ -String Application::GetRunAsUser(void) +String Application::GetRunAsUser() { return ScriptGlobal::Get("RunAsUser"); } @@ -1397,7 +1397,7 @@ void Application::DeclareRunAsUser(const String& user) * * @returns The name. */ -String Application::GetRunAsGroup(void) +String Application::GetRunAsGroup() { return ScriptGlobal::Get("RunAsGroup"); } @@ -1418,12 +1418,12 @@ void Application::DeclareRunAsGroup(const String& group) * * @returns The limit. */ -int Application::GetRLimitFiles(void) +int Application::GetRLimitFiles() { return ScriptGlobal::Get("RLimitFiles"); } -int Application::GetDefaultRLimitFiles(void) +int Application::GetDefaultRLimitFiles() { return 16 * 1024; } @@ -1444,12 +1444,12 @@ void Application::DeclareRLimitFiles(int limit) * * @returns The limit. */ -int Application::GetRLimitProcesses(void) +int Application::GetRLimitProcesses() { return ScriptGlobal::Get("RLimitProcesses"); } -int Application::GetDefaultRLimitProcesses(void) +int Application::GetDefaultRLimitProcesses() { return 16 * 1024; } @@ -1470,12 +1470,12 @@ void Application::DeclareRLimitProcesses(int limit) * * @returns The limit. */ -int Application::GetRLimitStack(void) +int Application::GetRLimitStack() { return ScriptGlobal::Get("RLimitStack"); } -int Application::GetDefaultRLimitStack(void) +int Application::GetDefaultRLimitStack() { return 256 * 1024; } @@ -1507,7 +1507,7 @@ void Application::DeclareConcurrency(int ncpus) * * @returns The concurrency level. */ -int Application::GetConcurrency(void) +int Application::GetConcurrency() { Value defaultConcurrency = std::thread::hardware_concurrency(); return ScriptGlobal::Get("Concurrency", &defaultConcurrency); @@ -1518,13 +1518,13 @@ int Application::GetConcurrency(void) * * @returns The global thread pool. */ -ThreadPool& Application::GetTP(void) +ThreadPool& Application::GetTP() { static ThreadPool tp; return tp; } -double Application::GetStartTime(void) +double Application::GetStartTime() { return m_StartTime; } @@ -1534,7 +1534,7 @@ void Application::SetStartTime(double ts) m_StartTime = ts; } -double Application::GetMainTime(void) +double Application::GetMainTime() { return m_MainTime; } @@ -1544,7 +1544,7 @@ void Application::SetMainTime(double ts) m_MainTime = ts; } -bool Application::GetScriptDebuggerEnabled(void) +bool Application::GetScriptDebuggerEnabled() { return m_ScriptDebuggerEnabled; } @@ -1554,7 +1554,7 @@ void Application::SetScriptDebuggerEnabled(bool enabled) m_ScriptDebuggerEnabled = enabled; } -double Application::GetLastReloadFailed(void) +double Application::GetLastReloadFailed() { return m_LastReloadFailed; } diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 4c207c38d..1f6874c46 100644 --- a/lib/base/application.hpp +++ b/lib/base/application.hpp @@ -39,44 +39,44 @@ class Application : public ObjectImpl { public: DECLARE_OBJECT(Application); - static boost::signals2::signal OnReopenLogs; + static boost::signals2::signal OnReopenLogs; - ~Application(void); + ~Application(); - static void InitializeBase(void); - static void UninitializeBase(void); + static void InitializeBase(); + static void UninitializeBase(); - static Application::Ptr GetInstance(void); + static Application::Ptr GetInstance(); static void Exit(int rc); - int Run(void); + int Run(); /** * Starts the application. * * @returns The exit code of the application. */ - virtual int Main(void) = 0; + virtual int Main() = 0; - static void SetResourceLimits(void); + static void SetResourceLimits(); - static int GetArgC(void); + static int GetArgC(); static void SetArgC(int argc); - static char **GetArgV(void); + static char **GetArgV(); static void SetArgV(char **argv); - static void InstallExceptionHandlers(void); + static void InstallExceptionHandlers(); - static void RequestShutdown(void); - static void RequestRestart(void); - static void RequestReopenLogs(void); + static void RequestShutdown(); + static void RequestRestart(); + static void RequestReopenLogs(); - static bool IsShuttingDown(void); + static bool IsShuttingDown(); static void SetDebuggingSeverity(LogSeverity severity); - static LogSeverity GetDebuggingSeverity(void); + static LogSeverity GetDebuggingSeverity(); void UpdatePidFile(const String& filename, pid_t pid = Utility::GetPid()); void ClosePidFile(bool unlink); @@ -84,95 +84,95 @@ public: static String GetExePath(const String& argv0); - static String GetPrefixDir(void); + static String GetPrefixDir(); static void DeclarePrefixDir(const String& path); - static String GetSysconfDir(void); + static String GetSysconfDir(); static void DeclareSysconfDir(const String& path); - static String GetZonesDir(void); + static String GetZonesDir(); static void DeclareZonesDir(const String& path); - static String GetRunDir(void); + static String GetRunDir(); static void DeclareRunDir(const String& path); - static String GetLocalStateDir(void); + static String GetLocalStateDir(); static void DeclareLocalStateDir(const String& path); - static String GetPkgDataDir(void); + static String GetPkgDataDir(); static void DeclarePkgDataDir(const String& path); - static String GetIncludeConfDir(void); + static String GetIncludeConfDir(); static void DeclareIncludeConfDir(const String& path); - static String GetStatePath(void); + static String GetStatePath(); static void DeclareStatePath(const String& path); - static String GetModAttrPath(void); + static String GetModAttrPath(); static void DeclareModAttrPath(const String& path); - static String GetObjectsPath(void); + static String GetObjectsPath(); static void DeclareObjectsPath(const String& path); - static String GetVarsPath(void); + static String GetVarsPath(); static void DeclareVarsPath(const String& path); - static String GetPidPath(void); + static String GetPidPath(); static void DeclarePidPath(const String& path); - static String GetRunAsUser(void); + static String GetRunAsUser(); static void DeclareRunAsUser(const String& user); - static String GetRunAsGroup(void); + static String GetRunAsGroup(); static void DeclareRunAsGroup(const String& group); #ifdef _WIN32 - static bool IsProcessElevated(void); + static bool IsProcessElevated(); #endif /* _WIN32 */ - static int GetRLimitFiles(void); - static int GetDefaultRLimitFiles(void); + static int GetRLimitFiles(); + static int GetDefaultRLimitFiles(); static void DeclareRLimitFiles(int limit); - static int GetRLimitProcesses(void); - static int GetDefaultRLimitProcesses(void); + static int GetRLimitProcesses(); + static int GetDefaultRLimitProcesses(); static void DeclareRLimitProcesses(int limit); - static int GetRLimitStack(void); - static int GetDefaultRLimitStack(void); + static int GetRLimitStack(); + static int GetDefaultRLimitStack(); static void DeclareRLimitStack(int limit); - static int GetConcurrency(void); + static int GetConcurrency(); static void DeclareConcurrency(int ncpus); - static ThreadPool& GetTP(void); + static ThreadPool& GetTP(); - static String GetAppVersion(void); - static String GetAppSpecVersion(void); + static String GetAppVersion(); + static String GetAppSpecVersion(); - static double GetStartTime(void); + static double GetStartTime(); static void SetStartTime(double ts); - static double GetMainTime(void); + static double GetMainTime(); static void SetMainTime(double ts); - static bool GetScriptDebuggerEnabled(void); + static bool GetScriptDebuggerEnabled(); static void SetScriptDebuggerEnabled(bool enabled); - static double GetLastReloadFailed(void); + static double GetLastReloadFailed(); static void SetLastReloadFailed(double ts); static void DisplayInfoMessage(std::ostream& os, bool skipVersion = false); protected: - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Stop(bool runtimeRemoved) override; - void RunEventLoop(void); + void RunEventLoop(); - pid_t StartReloadProcess(void); + pid_t StartReloadProcess(); - virtual void OnShutdown(void); + virtual void OnShutdown(); virtual void ValidateName(const String& value, const ValidationUtils& utils) override final; @@ -205,9 +205,9 @@ private: static void SigAbrtHandler(int signum); static void SigUsr1Handler(int signum); - static void ExceptionHandler(void); + static void ExceptionHandler(); - static String GetCrashReportFilename(void); + static String GetCrashReportFilename(); static void AttachDebugger(const String& filename, bool interactive); }; diff --git a/lib/base/array-script.cpp b/lib/base/array-script.cpp index 77c62206a..9bfec4130 100644 --- a/lib/base/array-script.cpp +++ b/lib/base/array-script.cpp @@ -26,7 +26,7 @@ using namespace icinga; -static double ArrayLen(void) +static double ArrayLen() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); @@ -68,7 +68,7 @@ static bool ArrayContains(const Value& value) return self->Contains(value); } -static void ArrayClear(void) +static void ArrayClear() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); @@ -103,7 +103,7 @@ static Array::Ptr ArraySort(const std::vector& args) return arr; } -static Array::Ptr ArrayShallowClone(void) +static Array::Ptr ArrayShallowClone() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); @@ -132,7 +132,7 @@ static Value ArrayJoin(const Value& separator) return result; } -static Array::Ptr ArrayReverse(void) +static Array::Ptr ArrayReverse() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); @@ -230,7 +230,7 @@ static bool ArrayAll(const Function::Ptr& function) return true; } -static Array::Ptr ArrayUnique(void) +static Array::Ptr ArrayUnique() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); @@ -245,7 +245,7 @@ static Array::Ptr ArrayUnique(void) return Array::FromSet(result); } -Object::Ptr Array::GetPrototype(void) +Object::Ptr Array::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/array.cpp b/lib/base/array.cpp index 8a5f884e2..202c9aee8 100644 --- a/lib/base/array.cpp +++ b/lib/base/array.cpp @@ -32,14 +32,14 @@ template class std::vector; REGISTER_PRIMITIVE_TYPE(Array, Object, Array::GetPrototype()); -Array::Array(void) +Array::Array() { } Array::Array(std::initializer_list init) : m_Data(init) { } -Array::~Array(void) +Array::~Array() { } /** @@ -112,7 +112,7 @@ void Array::Add(Value&& value) * * @returns An iterator. */ -Array::Iterator Array::Begin(void) +Array::Iterator Array::Begin() { ASSERT(OwnsLock()); @@ -126,7 +126,7 @@ Array::Iterator Array::Begin(void) * * @returns An iterator. */ -Array::Iterator Array::End(void) +Array::Iterator Array::End() { ASSERT(OwnsLock()); @@ -138,7 +138,7 @@ Array::Iterator Array::End(void) * * @returns Number of elements. */ -size_t Array::GetLength(void) const +size_t Array::GetLength() const { ObjectLock olock(this); @@ -204,7 +204,7 @@ void Array::Resize(SizeType newSize) m_Data.resize(newSize); } -void Array::Clear(void) +void Array::Clear() { ObjectLock olock(this); @@ -231,7 +231,7 @@ void Array::CopyTo(const Array::Ptr& dest) const * * @returns a copy of the array. */ -Array::Ptr Array::ShallowClone(void) const +Array::Ptr Array::ShallowClone() const { Array::Ptr clone = new Array(); CopyTo(clone); @@ -244,7 +244,7 @@ Array::Ptr Array::ShallowClone(void) const * * @returns a copy of the array. */ -Object::Ptr Array::Clone(void) const +Object::Ptr Array::Clone() const { Array::Ptr arr = new Array(); @@ -256,7 +256,7 @@ Object::Ptr Array::Clone(void) const return arr; } -Array::Ptr Array::Reverse(void) const +Array::Ptr Array::Reverse() const { Array::Ptr result = new Array(); @@ -268,13 +268,13 @@ Array::Ptr Array::Reverse(void) const return result; } -void Array::Sort(void) +void Array::Sort() { ObjectLock olock(this); std::sort(m_Data.begin(), m_Data.end()); } -String Array::ToString(void) const +String Array::ToString() const { std::ostringstream msgbuf; ConfigWriter::EmitArray(msgbuf, 1, const_cast(this)); diff --git a/lib/base/array.hpp b/lib/base/array.hpp index a6719c05d..3e19c7bfb 100644 --- a/lib/base/array.hpp +++ b/lib/base/array.hpp @@ -47,10 +47,10 @@ public: typedef std::vector::size_type SizeType; - Array(void); + Array(); Array(std::initializer_list init); - ~Array(void); + ~Array(); Value Get(SizeType index) const; void Set(SizeType index, const Value& value); @@ -58,10 +58,10 @@ public: void Add(const Value& value); void Add(Value&& value); - Iterator Begin(void); - Iterator End(void); + Iterator Begin(); + Iterator End(); - size_t GetLength(void) const; + size_t GetLength() const; bool Contains(const Value& value) const; void Insert(SizeType index, const Value& value); @@ -69,14 +69,14 @@ public: void Remove(Iterator it); void Resize(SizeType newSize); - void Clear(void); + void Clear(); void Reserve(SizeType newSize); void CopyTo(const Array::Ptr& dest) const; - Array::Ptr ShallowClone(void) const; + Array::Ptr ShallowClone() const; - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); template static Array::Ptr FromVector(const std::vector& v) @@ -88,7 +88,7 @@ public: } template - std::set ToSet(void) + std::set ToSet() { ObjectLock olock(this); return std::set(Begin(), End()); @@ -103,13 +103,13 @@ public: return result; } - virtual Object::Ptr Clone(void) const override; + virtual Object::Ptr Clone() const override; - Array::Ptr Reverse(void) const; + Array::Ptr Reverse() const; - void Sort(void); + void Sort(); - virtual String ToString(void) const override; + virtual String ToString() const override; virtual Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; virtual void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; diff --git a/lib/base/boolean-script.cpp b/lib/base/boolean-script.cpp index 01b78e32a..e0da2e9bc 100644 --- a/lib/base/boolean-script.cpp +++ b/lib/base/boolean-script.cpp @@ -25,14 +25,14 @@ using namespace icinga; -static String BooleanToString(void) +static String BooleanToString() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); bool self = vframe->Self; return self ? "true" : "false"; } -Object::Ptr Boolean::GetPrototype(void) +Object::Ptr Boolean::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/boolean.hpp b/lib/base/boolean.hpp index d9612026a..3175e9beb 100644 --- a/lib/base/boolean.hpp +++ b/lib/base/boolean.hpp @@ -33,10 +33,10 @@ class Value; class Boolean { public: - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); private: - Boolean(void); + Boolean(); }; } diff --git a/lib/base/configobject-script.cpp b/lib/base/configobject-script.cpp index b76bc6b8c..7321e3bf5 100644 --- a/lib/base/configobject-script.cpp +++ b/lib/base/configobject-script.cpp @@ -39,7 +39,7 @@ static void ConfigObjectRestoreAttribute(const String& attr) return self->RestoreAttribute(attr); } -Object::Ptr ConfigObject::GetPrototype(void) +Object::Ptr ConfigObject::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index 5610be878..4a6eb27bc 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -46,15 +46,15 @@ REGISTER_TYPE_WITH_PROTOTYPE(ConfigObject, ConfigObject::GetPrototype()); boost::signals2::signal ConfigObject::OnStateChanged; -ConfigObject::ConfigObject(void) +ConfigObject::ConfigObject() { } -bool ConfigObject::IsActive(void) const +bool ConfigObject::IsActive() const { return GetActive(); } -bool ConfigObject::IsPaused(void) const +bool ConfigObject::IsPaused() const { return GetPaused(); } @@ -349,7 +349,7 @@ bool ConfigObject::IsAttributeModified(const String& attr) const return original_attributes->Contains(attr); } -void ConfigObject::Register(void) +void ConfigObject::Register() { ASSERT(!OwnsLock()); @@ -357,7 +357,7 @@ void ConfigObject::Register(void) type->RegisterObject(this); } -void ConfigObject::Unregister(void) +void ConfigObject::Unregister() { ASSERT(!OwnsLock()); @@ -374,7 +374,7 @@ void ConfigObject::Start(bool runtimeCreated) SetStartCalled(true); } -void ConfigObject::PreActivate(void) +void ConfigObject::PreActivate() { CONTEXT("Setting 'active' to true for object '" + GetName() + "' of type '" + GetReflectionType()->GetName() + "'"); @@ -431,12 +431,12 @@ void ConfigObject::Deactivate(bool runtimeRemoved) NotifyActive(); } -void ConfigObject::OnConfigLoaded(void) +void ConfigObject::OnConfigLoaded() { /* Nothing to do here. */ } -void ConfigObject::OnAllConfigLoaded(void) +void ConfigObject::OnAllConfigLoaded() { static ConfigType *ctype; @@ -456,17 +456,17 @@ void ConfigObject::CreateChildObjects(const Type::Ptr& childType) /* Nothing to do here. */ } -void ConfigObject::OnStateLoaded(void) +void ConfigObject::OnStateLoaded() { /* Nothing to do here. */ } -void ConfigObject::Pause(void) +void ConfigObject::Pause() { SetPauseCalled(true); } -void ConfigObject::Resume(void) +void ConfigObject::Resume() { SetResumeCalled(true); } @@ -624,7 +624,7 @@ void ConfigObject::RestoreObjects(const String& filename, int attributeTypes) << "Restored " << restored << " objects. Loaded " << no_state << " new objects without state."; } -void ConfigObject::StopObjects(void) +void ConfigObject::StopObjects() { for (const Type::Ptr& type : Type::GetAllTypes()) { ConfigType *dtype = dynamic_cast(type.get()); @@ -711,12 +711,12 @@ ConfigObject::Ptr ConfigObject::GetObject(const String& type, const String& name return ctype->GetObject(name); } -ConfigObject::Ptr ConfigObject::GetZone(void) const +ConfigObject::Ptr ConfigObject::GetZone() const { return m_Zone; } -Dictionary::Ptr ConfigObject::GetSourceLocation(void) const +Dictionary::Ptr ConfigObject::GetSourceLocation() const { DebugInfo di = GetDebugInfo(); @@ -729,5 +729,5 @@ Dictionary::Ptr ConfigObject::GetSourceLocation(void) const return result; } -NameComposer::~NameComposer(void) +NameComposer::~NameComposer() { } diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp index f7a7a91a6..f3f7083dc 100644 --- a/lib/base/configobject.hpp +++ b/lib/base/configobject.hpp @@ -44,23 +44,23 @@ public: static boost::signals2::signal OnStateChanged; - bool IsActive(void) const; - bool IsPaused(void) const; + bool IsActive() const; + bool IsPaused() const; void SetExtension(const String& key, const Value& value); Value GetExtension(const String& key); void ClearExtension(const String& key); - ConfigObject::Ptr GetZone(void) const; + ConfigObject::Ptr GetZone() const; void ModifyAttribute(const String& attr, const Value& value, bool updateVersion = true); void RestoreAttribute(const String& attr, bool updateVersion = true); bool IsAttributeModified(const String& attr) const; - void Register(void); - void Unregister(void); + void Register(); + void Unregister(); - void PreActivate(void); + void PreActivate(); void Activate(bool runtimeCreated = false); void Deactivate(bool runtimeRemoved = false); void SetAuthority(bool authority); @@ -68,15 +68,15 @@ public: virtual void Start(bool runtimeCreated = false) override; virtual void Stop(bool runtimeRemoved = false) override; - virtual void Pause(void); - virtual void Resume(void); + virtual void Pause(); + virtual void Resume(); - virtual void OnConfigLoaded(void); + virtual void OnConfigLoaded(); virtual void CreateChildObjects(const Type::Ptr& childType); - virtual void OnAllConfigLoaded(void); - virtual void OnStateLoaded(void); + virtual void OnAllConfigLoaded(); + virtual void OnStateLoaded(); - virtual Dictionary::Ptr GetSourceLocation(void) const override; + virtual Dictionary::Ptr GetSourceLocation() const override; template static intrusive_ptr GetObject(const String& name) @@ -90,14 +90,14 @@ public: static void DumpObjects(const String& filename, int attributeTypes = FAState); static void RestoreObjects(const String& filename, int attributeTypes = FAState); - static void StopObjects(void); + static void StopObjects(); static void DumpModifiedAttributes(const std::function& callback); - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); protected: - explicit ConfigObject(void); + explicit ConfigObject(); private: ConfigObject::Ptr m_Zone; @@ -106,7 +106,7 @@ private: }; #define DECLARE_OBJECTNAME(klass) \ - inline static String GetTypeName(void) \ + inline static String GetTypeName() \ { \ return #klass; \ } \ diff --git a/lib/base/configobject.ti b/lib/base/configobject.ti index 535a6589b..7a010b1ab 100644 --- a/lib/base/configobject.ti +++ b/lib/base/configobject.ti @@ -35,7 +35,7 @@ enum HAMode class NameComposer { public: - virtual ~NameComposer(void); + virtual ~NameComposer(); virtual String MakeName(const String& shortName, const Object::Ptr& context) const = 0; virtual Dictionary::Ptr ParseName(const String& name) const = 0; @@ -49,7 +49,7 @@ code {{{ class ConfigObjectBase : public ObjectImpl { public: - inline DebugInfo GetDebugInfo(void) const + inline DebugInfo GetDebugInfo() const { return m_DebugInfo; } diff --git a/lib/base/configtype.cpp b/lib/base/configtype.cpp index 38fc020d7..4306df1bd 100644 --- a/lib/base/configtype.cpp +++ b/lib/base/configtype.cpp @@ -23,7 +23,7 @@ using namespace icinga; -ConfigType::~ConfigType(void) +ConfigType::~ConfigType() { } ConfigObject::Ptr ConfigType::GetObject(const String& name) const @@ -75,7 +75,7 @@ void ConfigType::UnregisterObject(const ConfigObject::Ptr& object) } } -std::vector ConfigType::GetObjects(void) const +std::vector ConfigType::GetObjects() const { boost::mutex::scoped_lock lock(m_Mutex); return m_ObjectVector; @@ -86,7 +86,7 @@ std::vector ConfigType::GetObjectsHelper(Type *type) return static_cast *>(type)->GetObjects(); } -int ConfigType::GetObjectCount(void) const +int ConfigType::GetObjectCount() const { boost::mutex::scoped_lock lock(m_Mutex); return m_ObjectVector.size(); diff --git a/lib/base/configtype.hpp b/lib/base/configtype.hpp index 5258ebe29..cf7f2b963 100644 --- a/lib/base/configtype.hpp +++ b/lib/base/configtype.hpp @@ -33,24 +33,24 @@ class ConfigObject; class ConfigType { public: - virtual ~ConfigType(void); + virtual ~ConfigType(); intrusive_ptr GetObject(const String& name) const; void RegisterObject(const intrusive_ptr& object); void UnregisterObject(const intrusive_ptr& object); - std::vector > GetObjects(void) const; + std::vector > GetObjects() const; template - static TypeImpl *Get(void) + static TypeImpl *Get() { typedef TypeImpl ObjType; return static_cast(T::TypeInstance.get()); } template - static std::vector > GetObjectsByType(void) + static std::vector > GetObjectsByType() { std::vector > objects = GetObjectsHelper(T::TypeInstance.get()); std::vector > result; @@ -60,7 +60,7 @@ public: return result; } - int GetObjectCount(void) const; + int GetObjectCount() const; private: typedef std::map > ObjectMap; diff --git a/lib/base/configwriter.cpp b/lib/base/configwriter.cpp index 3bea6668d..364e2518e 100644 --- a/lib/base/configwriter.cpp +++ b/lib/base/configwriter.cpp @@ -220,7 +220,7 @@ String ConfigWriter::EscapeIcingaString(const String& str) return result; } -const std::vector& ConfigWriter::GetKeywords(void) +const std::vector& ConfigWriter::GetKeywords() { static std::vector keywords; static boost::mutex mutex; @@ -273,7 +273,7 @@ ConfigIdentifier::ConfigIdentifier(const String& identifier) : m_Name(identifier) { } -String ConfigIdentifier::GetName(void) const +String ConfigIdentifier::GetName() const { return m_Name; } diff --git a/lib/base/configwriter.hpp b/lib/base/configwriter.hpp index 54eac6417..2649b8536 100644 --- a/lib/base/configwriter.hpp +++ b/lib/base/configwriter.hpp @@ -40,7 +40,7 @@ public: ConfigIdentifier(const String& name); - String GetName(void) const; + String GetName() const; private: String m_Name; @@ -73,10 +73,10 @@ public: static void EmitComment(std::ostream& fp, const String& text); static void EmitFunctionCall(std::ostream& fp, const String& name, const Array::Ptr& arguments); - static const std::vector& GetKeywords(void); + static const std::vector& GetKeywords(); private: static String EscapeIcingaString(const String& str); - ConfigWriter(void); + ConfigWriter(); }; } diff --git a/lib/base/console.cpp b/lib/base/console.cpp index 43b5c9738..d1b1b7d86 100644 --- a/lib/base/console.cpp +++ b/lib/base/console.cpp @@ -25,7 +25,7 @@ using namespace icinga; static ConsoleType l_ConsoleType = Console_Dumb; -static void InitializeConsole(void) +static void InitializeConsole() { l_ConsoleType = Console_Dumb; diff --git a/lib/base/console.hpp b/lib/base/console.hpp index 1b6456b5e..6e7a29bf9 100644 --- a/lib/base/console.hpp +++ b/lib/base/console.hpp @@ -88,7 +88,7 @@ std::ostream& operator<<(std::ostream& fp, const ConsoleColorTag& cct); class Console { public: - static void DetectType(void); + static void DetectType(); static void SetType(std::ostream& fp, ConsoleType type); static ConsoleType GetType(std::ostream& fp); @@ -100,7 +100,7 @@ public: #endif /* _WIN32 */ private: - Console(void); + Console(); }; } diff --git a/lib/base/context.cpp b/lib/base/context.cpp index 849d4eaba..09c46992c 100644 --- a/lib/base/context.cpp +++ b/lib/base/context.cpp @@ -29,12 +29,12 @@ ContextFrame::ContextFrame(const String& message) GetFrames().push_front(message); } -ContextFrame::~ContextFrame(void) +ContextFrame::~ContextFrame() { GetFrames().pop_front(); } -std::list& ContextFrame::GetFrames(void) +std::list& ContextFrame::GetFrames() { if (!l_Frames.get()) l_Frames.reset(new std::list()); @@ -42,7 +42,7 @@ std::list& ContextFrame::GetFrames(void) return *l_Frames; } -ContextTrace::ContextTrace(void) +ContextTrace::ContextTrace() : m_Frames(ContextFrame::GetFrames()) { } @@ -60,7 +60,7 @@ void ContextTrace::Print(std::ostream& fp) const } } -size_t ContextTrace::GetLength(void) const +size_t ContextTrace::GetLength() const { return m_Frames.size(); } diff --git a/lib/base/context.hpp b/lib/base/context.hpp index aa0b8c15c..5b53515b8 100644 --- a/lib/base/context.hpp +++ b/lib/base/context.hpp @@ -30,11 +30,11 @@ namespace icinga class ContextTrace { public: - ContextTrace(void); + ContextTrace(); void Print(std::ostream& fp) const; - size_t GetLength(void) const; + size_t GetLength() const; private: std::list m_Frames; @@ -51,10 +51,10 @@ class ContextFrame { public: ContextFrame(const String& message); - ~ContextFrame(void); + ~ContextFrame(); private: - static std::list& GetFrames(void); + static std::list& GetFrames(); friend class ContextTrace; }; diff --git a/lib/base/convert.hpp b/lib/base/convert.hpp index 4e7b4c4d3..84c66da5b 100644 --- a/lib/base/convert.hpp +++ b/lib/base/convert.hpp @@ -88,7 +88,7 @@ public: static double ToDateTimeValue(const Value& val); private: - Convert(void); + Convert(); }; } diff --git a/lib/base/datetime-script.cpp b/lib/base/datetime-script.cpp index 656ac747f..9c8f422c1 100644 --- a/lib/base/datetime-script.cpp +++ b/lib/base/datetime-script.cpp @@ -33,7 +33,7 @@ static String DateTimeFormat(const String& format) return self->Format(format); } -Object::Ptr DateTime::GetPrototype(void) +Object::Ptr DateTime::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/datetime.cpp b/lib/base/datetime.cpp index 2374c3d05..a043aa24e 100644 --- a/lib/base/datetime.cpp +++ b/lib/base/datetime.cpp @@ -59,7 +59,7 @@ DateTime::DateTime(const std::vector& args) BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid number of arguments for the DateTime constructor.")); } -double DateTime::GetValue(void) const +double DateTime::GetValue() const { return m_Value; } @@ -69,7 +69,7 @@ String DateTime::Format(const String& format) const return Utility::FormatDateTime(format.CStr(), m_Value); } -String DateTime::ToString(void) const +String DateTime::ToString() const { return Format("%Y-%m-%d %H:%M:%S %z"); } diff --git a/lib/base/datetime.hpp b/lib/base/datetime.hpp index 9378a6bde..68d912414 100644 --- a/lib/base/datetime.hpp +++ b/lib/base/datetime.hpp @@ -43,10 +43,10 @@ public: String Format(const String& format) const; - virtual double GetValue(void) const override; - virtual String ToString(void) const override; + virtual double GetValue() const override; + virtual String ToString() const override; - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); private: double m_Value; diff --git a/lib/base/debuginfo.cpp b/lib/base/debuginfo.cpp index 73305144d..944505dd2 100644 --- a/lib/base/debuginfo.cpp +++ b/lib/base/debuginfo.cpp @@ -23,7 +23,7 @@ using namespace icinga; -DebugInfo::DebugInfo(void) +DebugInfo::DebugInfo() : FirstLine(0), FirstColumn(0), LastLine(0), LastColumn(0) { } diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp index 0d54d0a92..0419c4897 100644 --- a/lib/base/debuginfo.hpp +++ b/lib/base/debuginfo.hpp @@ -41,7 +41,7 @@ struct DebugInfo int LastLine; int LastColumn; - DebugInfo(void); + DebugInfo(); }; std::ostream& operator<<(std::ostream& out, const DebugInfo& val); diff --git a/lib/base/dependencygraph.hpp b/lib/base/dependencygraph.hpp index f66a87cc5..3c111c727 100644 --- a/lib/base/dependencygraph.hpp +++ b/lib/base/dependencygraph.hpp @@ -39,7 +39,7 @@ public: static std::vector GetParents(const Object::Ptr& child); private: - DependencyGraph(void); + DependencyGraph(); static boost::mutex m_Mutex; static std::map > m_Dependencies; diff --git a/lib/base/dictionary-script.cpp b/lib/base/dictionary-script.cpp index 32984351c..ffa256f6b 100644 --- a/lib/base/dictionary-script.cpp +++ b/lib/base/dictionary-script.cpp @@ -25,7 +25,7 @@ using namespace icinga; -static double DictionaryLen(void) +static double DictionaryLen() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); @@ -60,14 +60,14 @@ static bool DictionaryContains(const String& key) return self->Contains(key); } -static Dictionary::Ptr DictionaryShallowClone(void) +static Dictionary::Ptr DictionaryShallowClone() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); return self->ShallowClone(); } -static Array::Ptr DictionaryKeys(void) +static Array::Ptr DictionaryKeys() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); @@ -79,7 +79,7 @@ static Array::Ptr DictionaryKeys(void) return keys; } -static Array::Ptr DictionaryValues(void) +static Array::Ptr DictionaryValues() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); @@ -91,7 +91,7 @@ static Array::Ptr DictionaryValues(void) return keys; } -Object::Ptr Dictionary::GetPrototype(void) +Object::Ptr Dictionary::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp index bc1607174..76c9b2b4a 100644 --- a/lib/base/dictionary.cpp +++ b/lib/base/dictionary.cpp @@ -29,10 +29,10 @@ template class std::map; REGISTER_PRIMITIVE_TYPE(Dictionary, Object, Dictionary::GetPrototype()); -Dictionary::Dictionary(void) +Dictionary::Dictionary() { } -Dictionary::~Dictionary(void) +Dictionary::~Dictionary() { } /** @@ -104,7 +104,7 @@ void Dictionary::Set(const String& key, Value&& value) * * @returns Number of elements. */ -size_t Dictionary::GetLength(void) const +size_t Dictionary::GetLength() const { ObjectLock olock(this); @@ -131,7 +131,7 @@ bool Dictionary::Contains(const String& key) const * * @returns An iterator. */ -Dictionary::Iterator Dictionary::Begin(void) +Dictionary::Iterator Dictionary::Begin() { ASSERT(OwnsLock()); @@ -145,7 +145,7 @@ Dictionary::Iterator Dictionary::Begin(void) * * @returns An iterator. */ -Dictionary::Iterator Dictionary::End(void) +Dictionary::Iterator Dictionary::End() { ASSERT(OwnsLock()); @@ -185,7 +185,7 @@ void Dictionary::Remove(const String& key) /** * Removes all dictionary items. */ -void Dictionary::Clear(void) +void Dictionary::Clear() { ObjectLock olock(this); @@ -206,7 +206,7 @@ void Dictionary::CopyTo(const Dictionary::Ptr& dest) const * * @returns a copy of the dictionary. */ -Dictionary::Ptr Dictionary::ShallowClone(void) const +Dictionary::Ptr Dictionary::ShallowClone() const { Dictionary::Ptr clone = new Dictionary(); CopyTo(clone); @@ -219,7 +219,7 @@ Dictionary::Ptr Dictionary::ShallowClone(void) const * * @returns a copy of the dictionary. */ -Object::Ptr Dictionary::Clone(void) const +Object::Ptr Dictionary::Clone() const { Dictionary::Ptr dict = new Dictionary(); @@ -237,7 +237,7 @@ Object::Ptr Dictionary::Clone(void) const * * @returns an array of key names */ -std::vector Dictionary::GetKeys(void) const +std::vector Dictionary::GetKeys() const { ObjectLock olock(this); @@ -250,7 +250,7 @@ std::vector Dictionary::GetKeys(void) const return keys; } -String Dictionary::ToString(void) const +String Dictionary::ToString() const { std::ostringstream msgbuf; ConfigWriter::EmitScope(msgbuf, 1, const_cast(this)); diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp index aae0ed8f9..8dbdf9960 100644 --- a/lib/base/dictionary.hpp +++ b/lib/base/dictionary.hpp @@ -49,9 +49,9 @@ public: typedef std::map::value_type Pair; - Dictionary(void); + Dictionary(); - ~Dictionary(void); + ~Dictionary(); Value Get(const String& key) const; bool Get(const String& key, Value *result) const; @@ -59,27 +59,27 @@ public: void Set(const String& key, Value&& value); bool Contains(const String& key) const; - Iterator Begin(void); - Iterator End(void); + Iterator Begin(); + Iterator End(); - size_t GetLength(void) const; + size_t GetLength() const; void Remove(const String& key); void Remove(Iterator it); - void Clear(void); + void Clear(); void CopyTo(const Dictionary::Ptr& dest) const; - Dictionary::Ptr ShallowClone(void) const; + Dictionary::Ptr ShallowClone() const; - std::vector GetKeys(void) const; + std::vector GetKeys() const; - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone(void) const override; + virtual Object::Ptr Clone() const override; - virtual String ToString(void) const override; + virtual String ToString() const override; virtual Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; virtual void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 1a5b50fa6..4c34efea7 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -91,7 +91,7 @@ static boost::thread_specific_ptr l_LastExceptionDest; extern "C" void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *)); #endif /* HAVE_CXXABI_H */ -void icinga::RethrowUncaughtException(void) +void icinga::RethrowUncaughtException() { #if defined(__GLIBCXX__) || !defined(HAVE_CXXABI_H) throw; @@ -145,7 +145,7 @@ void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *)) } #endif /* HAVE_CXXABI_H */ -StackTrace *icinga::GetLastExceptionStack(void) +StackTrace *icinga::GetLastExceptionStack() { return l_LastExceptionStack.get(); } @@ -155,7 +155,7 @@ void icinga::SetLastExceptionStack(const StackTrace& trace) l_LastExceptionStack.reset(new StackTrace(trace)); } -ContextTrace *icinga::GetLastExceptionContext(void) +ContextTrace *icinga::GetLastExceptionContext() { return l_LastExceptionContext.get(); } @@ -291,25 +291,25 @@ ScriptError::ScriptError(const String& message, const DebugInfo& di, bool incomp : m_Message(message), m_DebugInfo(di), m_IncompleteExpr(incompleteExpr), m_HandledByDebugger(false) { } -ScriptError::~ScriptError(void) throw() +ScriptError::~ScriptError() throw() { } -const char *ScriptError::what(void) const throw() +const char *ScriptError::what() const throw() { return m_Message.CStr(); } -DebugInfo ScriptError::GetDebugInfo(void) const +DebugInfo ScriptError::GetDebugInfo() const { return m_DebugInfo; } -bool ScriptError::IsIncompleteExpression(void) const +bool ScriptError::IsIncompleteExpression() const { return m_IncompleteExpr;; } -bool ScriptError::IsHandledByDebugger(void) const +bool ScriptError::IsHandledByDebugger() const { return m_HandledByDebugger; } @@ -319,16 +319,16 @@ void ScriptError::SetHandledByDebugger(bool handled) m_HandledByDebugger = handled; } -posix_error::posix_error(void) +posix_error::posix_error() : m_Message(nullptr) { } -posix_error::~posix_error(void) throw() +posix_error::~posix_error() throw() { free(m_Message); } -const char *posix_error::what(void) const throw() +const char *posix_error::what() const throw() { if (!m_Message) { std::ostringstream msgbuf; @@ -380,25 +380,25 @@ ValidationError::ValidationError(const ConfigObject::Ptr& object, const std::vec m_What += ": " + message; } -ValidationError::~ValidationError(void) throw() +ValidationError::~ValidationError() throw() { } -const char *ValidationError::what(void) const throw() +const char *ValidationError::what() const throw() { return m_What.CStr(); } -ConfigObject::Ptr ValidationError::GetObject(void) const +ConfigObject::Ptr ValidationError::GetObject() const { return m_Object; } -std::vector ValidationError::GetAttributePath(void) const +std::vector ValidationError::GetAttributePath() const { return m_AttributePath; } -String ValidationError::GetMessage(void) const +String ValidationError::GetMessage() const { return m_Message; } @@ -408,7 +408,7 @@ void ValidationError::SetDebugHint(const Dictionary::Ptr& dhint) m_DebugHint = dhint; } -Dictionary::Ptr ValidationError::GetDebugHint(void) const +Dictionary::Ptr ValidationError::GetDebugHint() const { return m_DebugHint; } diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index 18dbdd012..28aa9d4a7 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -53,14 +53,14 @@ class ScriptError : virtual public user_error public: ScriptError(const String& message); ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false); - ~ScriptError(void) throw(); + ~ScriptError() throw(); virtual const char *what(void) const throw() override final; - DebugInfo GetDebugInfo(void) const; - bool IsIncompleteExpression(void) const; + DebugInfo GetDebugInfo() const; + bool IsIncompleteExpression() const; - bool IsHandledByDebugger(void) const; + bool IsHandledByDebugger() const; void SetHandledByDebugger(bool handled); private: @@ -77,16 +77,16 @@ class ValidationError : virtual public user_error { public: ValidationError(const ConfigObject::Ptr& object, const std::vector& attributePath, const String& message); - ~ValidationError(void) throw(); + ~ValidationError() throw(); virtual const char *what(void) const throw() override final; - ConfigObject::Ptr GetObject(void) const; - std::vector GetAttributePath(void) const; - String GetMessage(void) const; + ConfigObject::Ptr GetObject() const; + std::vector GetAttributePath() const; + String GetMessage() const; void SetDebugHint(const Dictionary::Ptr& dhint); - Dictionary::Ptr GetDebugHint(void) const; + Dictionary::Ptr GetDebugHint() const; private: ConfigObject::Ptr m_Object; @@ -96,13 +96,13 @@ private: Dictionary::Ptr m_DebugHint; }; -StackTrace *GetLastExceptionStack(void); +StackTrace *GetLastExceptionStack(); void SetLastExceptionStack(const StackTrace& trace); -ContextTrace *GetLastExceptionContext(void); +ContextTrace *GetLastExceptionContext(); void SetLastExceptionContext(const ContextTrace& context); -void RethrowUncaughtException(void); +void RethrowUncaughtException(); typedef boost::error_info StackTraceErrorInfo; @@ -125,8 +125,8 @@ String DiagnosticInformation(boost::exception_ptr eptr, bool verbose = true); class posix_error : virtual public std::exception, virtual public boost::exception { public: - posix_error(void); - virtual ~posix_error(void) throw(); + posix_error(); + virtual ~posix_error() throw(); virtual const char *what(void) const throw() override final; diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp index 86ba8d716..b5a3fa0fa 100644 --- a/lib/base/fifo.cpp +++ b/lib/base/fifo.cpp @@ -24,14 +24,14 @@ using namespace icinga; /** * Constructor for the FIFO class. */ -FIFO::FIFO(void) +FIFO::FIFO() : m_Buffer(nullptr), m_DataSize(0), m_AllocSize(0), m_Offset(0) { } /** * Destructor for the FIFO class. */ -FIFO::~FIFO(void) +FIFO::~FIFO() { free(m_Buffer); } @@ -65,7 +65,7 @@ void FIFO::ResizeBuffer(size_t newSize, bool decrease) * Optimizes memory usage of the FIFO buffer by reallocating * and moving the buffer. */ -void FIFO::Optimize(void) +void FIFO::Optimize() { if (m_Offset > m_DataSize / 10 && m_Offset - m_DataSize > 1024) { std::memmove(m_Buffer, m_Buffer + m_Offset, m_DataSize); @@ -124,25 +124,25 @@ void FIFO::Write(const void *buffer, size_t count) SignalDataAvailable(); } -void FIFO::Close(void) +void FIFO::Close() { } -bool FIFO::IsEof(void) const +bool FIFO::IsEof() const { return false; } -size_t FIFO::GetAvailableBytes(void) const +size_t FIFO::GetAvailableBytes() const { return m_DataSize; } -bool FIFO::SupportsWaiting(void) const +bool FIFO::SupportsWaiting() const { return true; } -bool FIFO::IsDataAvailable(void) const +bool FIFO::IsDataAvailable() const { return m_DataSize > 0; } diff --git a/lib/base/fifo.hpp b/lib/base/fifo.hpp index 163087e9a..ed707e432 100644 --- a/lib/base/fifo.hpp +++ b/lib/base/fifo.hpp @@ -38,18 +38,18 @@ public: static const size_t BlockSize = 512; - FIFO(void); - ~FIFO(void); + FIFO(); + ~FIFO(); virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; virtual void Write(const void *buffer, size_t count) override; - virtual void Close(void) override; - virtual bool IsEof(void) const override; - virtual bool SupportsWaiting(void) const override; - virtual bool IsDataAvailable(void) const override; + virtual void Close() override; + virtual bool IsEof() const override; + virtual bool SupportsWaiting() const override; + virtual bool IsDataAvailable() const override; - size_t GetAvailableBytes(void) const; + size_t GetAvailableBytes() const; private: char *m_Buffer; @@ -58,7 +58,7 @@ private: size_t m_Offset; void ResizeBuffer(size_t newSize, bool decrease); - void Optimize(void); + void Optimize(); }; } diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp index d8d9fb574..1047290ce 100644 --- a/lib/base/filelogger.cpp +++ b/lib/base/filelogger.cpp @@ -53,7 +53,7 @@ void FileLogger::Start(bool runtimeCreated) ObjectImpl::Start(runtimeCreated); } -void FileLogger::ReopenLogFile(void) +void FileLogger::ReopenLogFile() { std::ofstream *stream = new std::ofstream(); diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp index 1728d973a..e251b7b57 100644 --- a/lib/base/filelogger.hpp +++ b/lib/base/filelogger.hpp @@ -42,7 +42,7 @@ public: virtual void Start(bool runtimeCreated) override; private: - void ReopenLogFile(void); + void ReopenLogFile(); }; } diff --git a/lib/base/function-script.cpp b/lib/base/function-script.cpp index 42fbe17f5..7f8a0aeec 100644 --- a/lib/base/function-script.cpp +++ b/lib/base/function-script.cpp @@ -53,7 +53,7 @@ static Value FunctionCallV(const Value& thisArg, const Array::Ptr& args) } -Object::Ptr Function::GetPrototype(void) +Object::Ptr Function::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/function.cpp b/lib/base/function.cpp index d79e78725..8fa90a3ca 100644 --- a/lib/base/function.cpp +++ b/lib/base/function.cpp @@ -48,7 +48,7 @@ Value Function::InvokeThis(const Value& otherThis, const std::vector& arg return m_Callback(arguments); } -Object::Ptr Function::Clone(void) const +Object::Ptr Function::Clone() const { return const_cast(this); } diff --git a/lib/base/function.hpp b/lib/base/function.hpp index d17fef526..270f39b2d 100644 --- a/lib/base/function.hpp +++ b/lib/base/function.hpp @@ -51,19 +51,19 @@ public: Value Invoke(const std::vector& arguments = std::vector()); Value InvokeThis(const Value& otherThis, const std::vector& arguments = std::vector()); - bool IsSideEffectFree(void) const + bool IsSideEffectFree() const { return GetSideEffectFree(); } - bool IsDeprecated(void) const + bool IsDeprecated() const { return GetDeprecated(); } - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone(void) const override; + virtual Object::Ptr Clone() const override; private: Callback m_Callback; diff --git a/lib/base/initialize.cpp b/lib/base/initialize.cpp index 460733868..feffb4816 100644 --- a/lib/base/initialize.cpp +++ b/lib/base/initialize.cpp @@ -22,7 +22,7 @@ using namespace icinga; -bool icinga::InitializeOnceHelper(void (*func)(void), int priority) +bool icinga::InitializeOnceHelper(void (*func)(), int priority) { Loader::AddDeferredInitializer(func, priority); return true; diff --git a/lib/base/initialize.hpp b/lib/base/initialize.hpp index dbc31149d..942aa5b0f 100644 --- a/lib/base/initialize.hpp +++ b/lib/base/initialize.hpp @@ -30,7 +30,7 @@ namespace icinga #define I2_UNIQUE_NAME(prefix) I2_TOKENPASTE2(prefix, __COUNTER__) -bool InitializeOnceHelper(void (*func)(void), int priority = 0); +bool InitializeOnceHelper(void (*func)(), int priority = 0); #define INITIALIZE_ONCE(func) \ namespace { namespace I2_UNIQUE_NAME(io) { \ diff --git a/lib/base/json.cpp b/lib/base/json.cpp index 48060c2c0..505d0bea2 100644 --- a/lib/base/json.cpp +++ b/lib/base/json.cpp @@ -129,7 +129,7 @@ struct JsonElement bool KeySet; Value EValue; - JsonElement(void) + JsonElement() : KeySet(false) { } }; @@ -145,7 +145,7 @@ public: m_Stack.push(element); } - JsonElement Pop(void) + JsonElement Pop() { JsonElement value = m_Stack.top(); m_Stack.pop(); @@ -180,18 +180,18 @@ public: } } - Value GetValue(void) const + Value GetValue() const { ASSERT(m_Stack.size() == 1); return m_Stack.top().EValue; } - void SaveException(void) + void SaveException() { m_Exception = boost::current_exception(); } - void ThrowException(void) const + void ThrowException() const { if (m_Exception) boost::rethrow_exception(m_Exception); diff --git a/lib/base/library.hpp b/lib/base/library.hpp index 9ef1fce45..6cbc23a70 100644 --- a/lib/base/library.hpp +++ b/lib/base/library.hpp @@ -36,7 +36,7 @@ typedef HMODULE LibraryHandle; class Library { public: - Library(void) = default; + Library() = default; Library(const String& name); void *GetSymbolAddress(const String& name) const; diff --git a/lib/base/loader.cpp b/lib/base/loader.cpp index 83ebd879b..a44beae76 100644 --- a/lib/base/loader.cpp +++ b/lib/base/loader.cpp @@ -24,13 +24,13 @@ using namespace icinga; -boost::thread_specific_ptr >& Loader::GetDeferredInitializers(void) +boost::thread_specific_ptr >& Loader::GetDeferredInitializers() { static boost::thread_specific_ptr > initializers; return initializers; } -void Loader::ExecuteDeferredInitializers(void) +void Loader::ExecuteDeferredInitializers() { if (!GetDeferredInitializers().get()) return; @@ -42,7 +42,7 @@ void Loader::ExecuteDeferredInitializers(void) } } -void Loader::AddDeferredInitializer(const std::function& callback, int priority) +void Loader::AddDeferredInitializer(const std::function& callback, int priority) { if (!GetDeferredInitializers().get()) GetDeferredInitializers().reset(new std::priority_queue()); diff --git a/lib/base/loader.hpp b/lib/base/loader.hpp index 2462fc027..5b07b187b 100644 --- a/lib/base/loader.hpp +++ b/lib/base/loader.hpp @@ -31,7 +31,7 @@ namespace icinga struct DeferredInitializer { public: - DeferredInitializer(const std::function& callback, int priority) + DeferredInitializer(const std::function& callback, int priority) : m_Callback(callback), m_Priority(priority) { } @@ -40,13 +40,13 @@ public: return m_Priority < other.m_Priority; } - void operator()(void) + void operator()() { m_Callback(); } private: - std::function m_Callback; + std::function m_Callback; int m_Priority; }; @@ -58,13 +58,13 @@ private: class Loader { public: - static void AddDeferredInitializer(const std::function& callback, int priority = 0); - static void ExecuteDeferredInitializers(void); + static void AddDeferredInitializer(const std::function& callback, int priority = 0); + static void ExecuteDeferredInitializers(); private: - Loader(void); + Loader(); - static boost::thread_specific_ptr >& GetDeferredInitializers(void); + static boost::thread_specific_ptr >& GetDeferredInitializers(); }; } diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp index e134f0655..1a915b966 100644 --- a/lib/base/logger.cpp +++ b/lib/base/logger.cpp @@ -77,7 +77,7 @@ void Logger::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -std::set Logger::GetLoggers(void) +std::set Logger::GetLoggers() { boost::mutex::scoped_lock lock(m_Mutex); return m_Loggers; @@ -88,7 +88,7 @@ std::set Logger::GetLoggers(void) * * @returns The minimum severity. */ -LogSeverity Logger::GetMinSeverity(void) const +LogSeverity Logger::GetMinSeverity() const { String severity = GetSeverity(); if (severity.IsEmpty()) @@ -148,17 +148,17 @@ LogSeverity Logger::StringToSeverity(const String& severity) BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid severity: " + severity)); } -void Logger::DisableConsoleLog(void) +void Logger::DisableConsoleLog() { m_ConsoleLogEnabled = false; } -void Logger::EnableConsoleLog(void) +void Logger::EnableConsoleLog() { m_ConsoleLogEnabled = true; } -bool Logger::IsConsoleLogEnabled(void) +bool Logger::IsConsoleLogEnabled() { return m_ConsoleLogEnabled; } @@ -168,7 +168,7 @@ void Logger::SetConsoleLogSeverity(LogSeverity logSeverity) m_ConsoleLogSeverity = logSeverity; } -LogSeverity Logger::GetConsoleLogSeverity(void) +LogSeverity Logger::GetConsoleLogSeverity() { return m_ConsoleLogSeverity; } @@ -178,7 +178,7 @@ void Logger::DisableTimestamp(bool disable) m_TimestampEnabled = !disable; } -bool Logger::IsTimestampEnabled(void) +bool Logger::IsTimestampEnabled() { return m_TimestampEnabled; } @@ -207,7 +207,7 @@ Log::Log(LogSeverity severity, const String& facility) /** * Writes the message to the application's log. */ -Log::~Log(void) +Log::~Log() { LogEntry entry; entry.Timestamp = Utility::GetTime(); diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index a7532c615..a084f37c8 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -67,7 +67,7 @@ public: static String SeverityToString(LogSeverity severity); static LogSeverity StringToSeverity(const String& severity); - LogSeverity GetMinSeverity(void) const; + LogSeverity GetMinSeverity() const; /** * Processes the log entry and writes it to the log that is @@ -77,18 +77,18 @@ public: */ virtual void ProcessLogEntry(const LogEntry& entry) = 0; - virtual void Flush(void) = 0; + virtual void Flush() = 0; - static std::set GetLoggers(void); + static std::set GetLoggers(); - static void DisableConsoleLog(void); - static void EnableConsoleLog(void); - static bool IsConsoleLogEnabled(void); + static void DisableConsoleLog(); + static void EnableConsoleLog(); + static bool IsConsoleLogEnabled(); static void DisableTimestamp(bool); - static bool IsTimestampEnabled(void); + static bool IsTimestampEnabled(); static void SetConsoleLogSeverity(LogSeverity logSeverity); - static LogSeverity GetConsoleLogSeverity(void); + static LogSeverity GetConsoleLogSeverity(); virtual void ValidateSeverity(const String& value, const ValidationUtils& utils) override final; @@ -107,14 +107,14 @@ private: class Log { public: - Log(void) = delete; + Log() = delete; Log(const Log& other) = delete; Log& operator=(const Log& rhs) = delete; Log(LogSeverity severity, const String& facility, const String& message); Log(LogSeverity severity, const String& facility); - ~Log(void); + ~Log(); template Log& operator<<(const T& val) diff --git a/lib/base/math-script.cpp b/lib/base/math-script.cpp index f8f92f530..f6f05ece8 100644 --- a/lib/base/math-script.cpp +++ b/lib/base/math-script.cpp @@ -112,7 +112,7 @@ static double MathPow(double x, double y) return std::pow(x, y); } -static double MathRandom(void) +static double MathRandom() { return (double)std::rand() / RAND_MAX; } diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp index a5f3ed039..4ba02ccd3 100644 --- a/lib/base/netstring.hpp +++ b/lib/base/netstring.hpp @@ -43,7 +43,7 @@ public: static void WriteStringToStream(std::ostream& stream, const String& message); private: - NetString(void); + NetString(); }; } diff --git a/lib/base/networkstream.cpp b/lib/base/networkstream.cpp index b3f426471..d9e66e8cd 100644 --- a/lib/base/networkstream.cpp +++ b/lib/base/networkstream.cpp @@ -25,7 +25,7 @@ NetworkStream::NetworkStream(const Socket::Ptr& socket) : m_Socket(socket), m_Eof(false) { } -void NetworkStream::Close(void) +void NetworkStream::Close() { Stream::Close(); @@ -92,7 +92,7 @@ void NetworkStream::Write(const void *buffer, size_t count) } } -bool NetworkStream::IsEof(void) const +bool NetworkStream::IsEof() const { return m_Eof; } diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp index 1860d777a..86c4edb0e 100644 --- a/lib/base/networkstream.hpp +++ b/lib/base/networkstream.hpp @@ -42,9 +42,9 @@ public: virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; virtual void Write(const void *buffer, size_t count) override; - virtual void Close(void) override; + virtual void Close() override; - virtual bool IsEof(void) const override; + virtual bool IsEof() const override; private: Socket::Ptr m_Socket; diff --git a/lib/base/number-script.cpp b/lib/base/number-script.cpp index 96f0f560d..8458f8d21 100644 --- a/lib/base/number-script.cpp +++ b/lib/base/number-script.cpp @@ -25,13 +25,13 @@ using namespace icinga; -static String NumberToString(void) +static String NumberToString() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); return vframe->Self; } -Object::Ptr Number::GetPrototype(void) +Object::Ptr Number::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/number.hpp b/lib/base/number.hpp index 3bff5ddbc..239ec299a 100644 --- a/lib/base/number.hpp +++ b/lib/base/number.hpp @@ -33,10 +33,10 @@ class Value; class Number { public: - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); private: - Number(void); + Number(); }; } diff --git a/lib/base/object-script.cpp b/lib/base/object-script.cpp index a0b537f36..3adf20d00 100644 --- a/lib/base/object-script.cpp +++ b/lib/base/object-script.cpp @@ -25,7 +25,7 @@ using namespace icinga; -static String ObjectToString(void) +static String ObjectToString() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Object::Ptr self = static_cast(vframe->Self); @@ -39,14 +39,14 @@ static void ObjectNotifyAttribute(const String& attribute) self->NotifyField(self->GetReflectionType()->GetFieldId(attribute)); } -static Object::Ptr ObjectClone(void) +static Object::Ptr ObjectClone() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Object::Ptr self = static_cast(vframe->Self); return self->Clone(); } -Object::Ptr Object::GetPrototype(void) +Object::Ptr Object::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/object.cpp b/lib/base/object.cpp index f435ca9be..46e37072b 100644 --- a/lib/base/object.cpp +++ b/lib/base/object.cpp @@ -41,7 +41,7 @@ static Timer::Ptr l_ObjectCountTimer; /** * Default constructor for the Object class. */ -Object::Object(void) +Object::Object() : m_References(0), m_Mutex(0) #ifdef I2_DEBUG , m_LockOwner(0) @@ -51,7 +51,7 @@ Object::Object(void) /** * Destructor for the Object class. */ -Object::~Object(void) +Object::~Object() { delete reinterpret_cast(m_Mutex); } @@ -59,7 +59,7 @@ Object::~Object(void) /** * Returns a string representation for the object. */ -String Object::ToString(void) const +String Object::ToString() const { return "Object of type '" + GetReflectionType()->GetName() + "'"; } @@ -70,7 +70,7 @@ String Object::ToString(void) const * * @returns True if the calling thread owns the lock, false otherwise. */ -bool Object::OwnsLock(void) const +bool Object::OwnsLock() const { #ifdef _WIN32 DWORD tid = InterlockedExchangeAdd(&m_LockOwner, 0); @@ -193,12 +193,12 @@ Object::Ptr Object::NavigateField(int id) const BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID.")); } -Object::Ptr Object::Clone(void) const +Object::Ptr Object::Clone() const { BOOST_THROW_EXCEPTION(std::runtime_error("Object cannot be cloned.")); } -Type::Ptr Object::GetReflectionType(void) const +Type::Ptr Object::GetReflectionType() const { return Object::TypeInstance; } @@ -238,7 +238,7 @@ void icinga::TypeRemoveObject(Object *object) l_ObjectCounts[typeName]--; } -static void TypeInfoTimerHandler(void) +static void TypeInfoTimerHandler() { boost::mutex::scoped_lock lock(l_ObjectCountLock); diff --git a/lib/base/object.hpp b/lib/base/object.hpp index a5cfaf502..6ebf66de6 100644 --- a/lib/base/object.hpp +++ b/lib/base/object.hpp @@ -49,7 +49,7 @@ extern Value Empty; #define IMPL_TYPE_LOOKUP() \ static intrusive_ptr TypeInstance; \ - virtual intrusive_ptr GetReflectionType(void) const override \ + virtual intrusive_ptr GetReflectionType() const override \ { \ return TypeInstance; \ } @@ -83,7 +83,7 @@ struct TypeHelper template struct TypeHelper { - static ObjectFactory GetFactory(void) + static ObjectFactory GetFactory() { return DefaultObjectFactory; } @@ -92,7 +92,7 @@ struct TypeHelper template struct TypeHelper { - static ObjectFactory GetFactory(void) + static ObjectFactory GetFactory() { return DefaultObjectFactoryVA; } @@ -109,12 +109,12 @@ class Object public: DECLARE_PTR_TYPEDEFS(Object); - Object(void); - virtual ~Object(void); + Object(); + virtual ~Object(); - virtual String ToString(void) const; + virtual String ToString() const; - virtual intrusive_ptr GetReflectionType(void) const; + virtual intrusive_ptr GetReflectionType() const; virtual void Validate(int types, const ValidationUtils& utils); @@ -129,12 +129,12 @@ public: virtual Object::Ptr NavigateField(int id) const; #ifdef I2_DEBUG - bool OwnsLock(void) const; + bool OwnsLock() const; #endif /* I2_DEBUG */ - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone(void) const; + virtual Object::Ptr Clone() const; static intrusive_ptr TypeInstance; diff --git a/lib/base/objectlock.cpp b/lib/base/objectlock.cpp index 5d44de30b..a15682025 100644 --- a/lib/base/objectlock.cpp +++ b/lib/base/objectlock.cpp @@ -25,11 +25,11 @@ using namespace icinga; #define I2MUTEX_UNLOCKED 0 #define I2MUTEX_LOCKED 1 -ObjectLock::ObjectLock(void) +ObjectLock::ObjectLock() : m_Object(nullptr), m_Locked(false) { } -ObjectLock::~ObjectLock(void) +ObjectLock::~ObjectLock() { Unlock(); } @@ -85,7 +85,7 @@ void ObjectLock::LockMutex(const Object *object) #endif /* _WIN32 */ } -void ObjectLock::Lock(void) +void ObjectLock::Lock() { ASSERT(!m_Locked && m_Object); @@ -121,7 +121,7 @@ void ObjectLock::Spin(unsigned int it) } } -void ObjectLock::Unlock(void) +void ObjectLock::Unlock() { #ifdef I2_DEBUG if (m_Locked) { diff --git a/lib/base/objectlock.hpp b/lib/base/objectlock.hpp index cf7c6d12b..469419770 100644 --- a/lib/base/objectlock.hpp +++ b/lib/base/objectlock.hpp @@ -31,19 +31,19 @@ namespace icinga struct ObjectLock { public: - ObjectLock(void); + ObjectLock(); ObjectLock(const Object::Ptr& object); ObjectLock(const Object *object); - ~ObjectLock(void); + ~ObjectLock(); static void LockMutex(const Object *object); - void Lock(void); + void Lock(); static void Spin(unsigned int it); - void Unlock(void); + void Unlock(); private: const Object *m_Object; diff --git a/lib/base/objecttype.cpp b/lib/base/objecttype.cpp index ab985915c..f61f4f0ba 100644 --- a/lib/base/objecttype.cpp +++ b/lib/base/objecttype.cpp @@ -29,20 +29,20 @@ INITIALIZE_ONCE_WITH_PRIORITY([]() { Object::TypeInstance = type; }, 20); -ObjectType::ObjectType(void) +ObjectType::ObjectType() { } -String ObjectType::GetName(void) const +String ObjectType::GetName() const { return "Object"; } -Type::Ptr ObjectType::GetBaseType(void) const +Type::Ptr ObjectType::GetBaseType() const { return nullptr; } -int ObjectType::GetAttributes(void) const +int ObjectType::GetAttributes() const { return 0; } @@ -63,12 +63,12 @@ Field ObjectType::GetFieldInfo(int id) const BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID.")); } -int ObjectType::GetFieldCount(void) const +int ObjectType::GetFieldCount() const { return 1; } -ObjectFactory ObjectType::GetFactory(void) const +ObjectFactory ObjectType::GetFactory() const { return DefaultObjectFactory; } diff --git a/lib/base/objecttype.hpp b/lib/base/objecttype.hpp index f60b309b9..c750467be 100644 --- a/lib/base/objecttype.hpp +++ b/lib/base/objecttype.hpp @@ -30,17 +30,17 @@ namespace icinga class ObjectType final : public Type { public: - ObjectType(void); + ObjectType(); - virtual String GetName(void) const override; - virtual Type::Ptr GetBaseType(void) const override; - virtual int GetAttributes(void) const override; + virtual String GetName() const override; + virtual Type::Ptr GetBaseType() const override; + virtual int GetAttributes() const override; virtual int GetFieldId(const String& name) const override; virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount(void) const override; + virtual int GetFieldCount() const override; protected: - virtual ObjectFactory GetFactory(void) const override; + virtual ObjectFactory GetFactory() const override; }; } diff --git a/lib/base/perfdatavalue.cpp b/lib/base/perfdatavalue.cpp index 21328b8f1..17cb183bd 100644 --- a/lib/base/perfdatavalue.cpp +++ b/lib/base/perfdatavalue.cpp @@ -32,7 +32,7 @@ using namespace icinga; REGISTER_TYPE(PerfdataValue); REGISTER_SCRIPTFUNCTION_NS(System, parse_performance_data, PerfdataValue::Parse, "perfdata"); -PerfdataValue::PerfdataValue(void) +PerfdataValue::PerfdataValue() { } PerfdataValue::PerfdataValue(String label, double value, bool counter, @@ -139,7 +139,7 @@ PerfdataValue::Ptr PerfdataValue::Parse(const String& perfdata) return new PerfdataValue(label, value, counter, unit, warn, crit, min, max); } -String PerfdataValue::Format(void) const +String PerfdataValue::Format() const { std::ostringstream result; diff --git a/lib/base/perfdatavalue.hpp b/lib/base/perfdatavalue.hpp index 305758b4f..35c88d106 100644 --- a/lib/base/perfdatavalue.hpp +++ b/lib/base/perfdatavalue.hpp @@ -36,14 +36,14 @@ class PerfdataValue final : public ObjectImpl public: DECLARE_OBJECT(PerfdataValue); - PerfdataValue(void); + PerfdataValue(); PerfdataValue(String label, double value, bool counter = false, const String& unit = "", const Value& warn = Empty, const Value& crit = Empty, const Value& min = Empty, const Value& max = Empty); static PerfdataValue::Ptr Parse(const String& perfdata); - String Format(void) const; + String Format() const; private: static Value ParseWarnCritMinMaxToken(const std::vector& tokens, diff --git a/lib/base/primitivetype.cpp b/lib/base/primitivetype.cpp index 8e9d83ee7..6be423d5e 100644 --- a/lib/base/primitivetype.cpp +++ b/lib/base/primitivetype.cpp @@ -26,12 +26,12 @@ PrimitiveType::PrimitiveType(const String& name, const String& base, const Objec : m_Name(name), m_Base(base), m_Factory(factory) { } -String PrimitiveType::GetName(void) const +String PrimitiveType::GetName() const { return m_Name; } -Type::Ptr PrimitiveType::GetBaseType(void) const +Type::Ptr PrimitiveType::GetBaseType() const { if (m_Base == "None") return nullptr; @@ -39,7 +39,7 @@ Type::Ptr PrimitiveType::GetBaseType(void) const return Type::GetByName(m_Base); } -int PrimitiveType::GetAttributes(void) const +int PrimitiveType::GetAttributes() const { return 0; } @@ -64,7 +64,7 @@ Field PrimitiveType::GetFieldInfo(int id) const throw std::runtime_error("Invalid field ID."); } -int PrimitiveType::GetFieldCount(void) const +int PrimitiveType::GetFieldCount() const { Type::Ptr base = GetBaseType(); @@ -74,7 +74,7 @@ int PrimitiveType::GetFieldCount(void) const return 0; } -ObjectFactory PrimitiveType::GetFactory(void) const +ObjectFactory PrimitiveType::GetFactory() const { return m_Factory; } diff --git a/lib/base/primitivetype.hpp b/lib/base/primitivetype.hpp index 9db856385..a559e603d 100644 --- a/lib/base/primitivetype.hpp +++ b/lib/base/primitivetype.hpp @@ -32,15 +32,15 @@ class PrimitiveType final : public Type public: PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory()); - virtual String GetName(void) const override; - virtual Type::Ptr GetBaseType(void) const override; - virtual int GetAttributes(void) const override; + virtual String GetName() const override; + virtual Type::Ptr GetBaseType() const override; + virtual int GetAttributes() const override; virtual int GetFieldId(const String& name) const override; virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount(void) const override; + virtual int GetFieldCount() const override; protected: - virtual ObjectFactory GetFactory(void) const override; + virtual ObjectFactory GetFactory() const override; private: String m_Name; diff --git a/lib/base/process.cpp b/lib/base/process.cpp index fbe67bb82..d8c381c7f 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -76,7 +76,7 @@ Process::Process(const Process::Arguments& arguments, const Dictionary::Ptr& ext #endif /* _WIN32 */ } -Process::~Process(void) +Process::~Process() { #ifdef _WIN32 CloseHandle(m_Overlapped.hEvent); @@ -237,7 +237,7 @@ static Value ProcessWaitPIDImpl(struct msghdr *msgh, const Dictionary::Ptr& requ return response; } -static void ProcessHandler(void) +static void ProcessHandler() { sigset_t mask; sigfillset(&mask); @@ -333,7 +333,7 @@ static void ProcessHandler(void) _exit(0); } -static void StartSpawnProcessHelper(void) +static void StartSpawnProcessHelper() { if (l_ProcessControlFD != -1) { (void)close(l_ProcessControlFD); @@ -497,14 +497,14 @@ send_message: return response->Get("rc"); } -void Process::InitializeSpawnHelper(void) +void Process::InitializeSpawnHelper() { if (l_ProcessControlFD == -1) StartSpawnProcessHelper(); } #endif /* _WIN32 */ -static void InitializeProcess(void) +static void InitializeProcess() { for (int tid = 0; tid < IOTHREADS; tid++) { #ifdef _WIN32 @@ -536,7 +536,7 @@ static void InitializeProcess(void) INITIALIZE_ONCE(InitializeProcess); -void Process::ThreadInitialize(void) +void Process::ThreadInitialize() { /* Note to self: Make sure this runs _after_ we've daemonized. */ for (int tid = 0; tid < IOTHREADS; tid++) { @@ -583,7 +583,7 @@ void Process::SetTimeout(double timeout) m_Timeout = timeout; } -double Process::GetTimeout(void) const +double Process::GetTimeout() const { return m_Timeout; } @@ -593,7 +593,7 @@ void Process::SetAdjustPriority(bool adjust) m_AdjustPriority = adjust; } -bool Process::GetAdjustPriority(void) const +bool Process::GetAdjustPriority() const { return m_AdjustPriority; } @@ -1016,7 +1016,7 @@ void Process::Run(const std::function& callback) #endif /* _WIN32 */ } -bool Process::DoEvents(void) +bool Process::DoEvents() { bool is_timeout = false; #ifndef _WIN32 @@ -1134,13 +1134,13 @@ bool Process::DoEvents(void) return false; } -pid_t Process::GetPID(void) const +pid_t Process::GetPID() const { return m_PID; } -int Process::GetTID(void) const +int Process::GetTID() const { return (reinterpret_cast(this) / sizeof(void *)) % IOTHREADS; } diff --git a/lib/base/process.hpp b/lib/base/process.hpp index a4dd5aea6..e0d7b7201 100644 --- a/lib/base/process.hpp +++ b/lib/base/process.hpp @@ -67,26 +67,26 @@ public: static const std::deque::size_type MaxTasksPerThread = 512; Process(const Arguments& arguments, const Dictionary::Ptr& extraEnvironment = nullptr); - ~Process(void); + ~Process(); void SetTimeout(double timeout); - double GetTimeout(void) const; + double GetTimeout() const; void SetAdjustPriority(bool adjust); - bool GetAdjustPriority(void) const; + bool GetAdjustPriority() const; void Run(const std::function& callback = std::function()); - pid_t GetPID(void) const; + pid_t GetPID() const; static Arguments PrepareCommand(const Value& command); - static void ThreadInitialize(void); + static void ThreadInitialize(); static String PrettyPrintArguments(const Arguments& arguments); #ifndef _WIN32 - static void InitializeSpawnHelper(void); + static void InitializeSpawnHelper(); #endif /* _WIN32 */ private: @@ -112,8 +112,8 @@ private: ProcessResult m_Result; static void IOThreadProc(int tid); - bool DoEvents(void); - int GetTID(void) const; + bool DoEvents(); + int GetTID() const; }; } diff --git a/lib/base/registry.hpp b/lib/base/registry.hpp index c196d260f..b1fe350f9 100644 --- a/lib/base/registry.hpp +++ b/lib/base/registry.hpp @@ -70,7 +70,7 @@ public: OnUnregistered(name); } - void Clear(void) + void Clear() { typename Registry::ItemMap items; @@ -101,7 +101,7 @@ public: return it->second; } - ItemMap GetItems(void) const + ItemMap GetItems() const { boost::mutex::scoped_lock lock(m_Mutex); diff --git a/lib/base/ringbuffer.cpp b/lib/base/ringbuffer.cpp index 293c9b0e3..f7fd4d882 100644 --- a/lib/base/ringbuffer.cpp +++ b/lib/base/ringbuffer.cpp @@ -28,7 +28,7 @@ RingBuffer::RingBuffer(RingBuffer::SizeType slots) : Object(), m_Slots(slots, 0), m_TimeValue(0), m_InsertedValues(0) { } -RingBuffer::SizeType RingBuffer::GetLength(void) const +RingBuffer::SizeType RingBuffer::GetLength() const { ObjectLock olock(this); diff --git a/lib/base/ringbuffer.hpp b/lib/base/ringbuffer.hpp index dd5fe7359..94917668a 100644 --- a/lib/base/ringbuffer.hpp +++ b/lib/base/ringbuffer.hpp @@ -41,7 +41,7 @@ public: RingBuffer(SizeType slots); - SizeType GetLength(void) const; + SizeType GetLength() const; void InsertValue(SizeType tv, int num); int UpdateAndGetValues(SizeType tv, SizeType span); double CalculateRate(SizeType tv, SizeType span); diff --git a/lib/base/scriptframe.cpp b/lib/base/scriptframe.cpp index 7d4367926..9ff9f0462 100644 --- a/lib/base/scriptframe.cpp +++ b/lib/base/scriptframe.cpp @@ -52,7 +52,7 @@ ScriptFrame::ScriptFrame(bool allocLocals, const Value& self) InitializeFrame(); } -void ScriptFrame::InitializeFrame(void) +void ScriptFrame::InitializeFrame() { std::stack *frames = m_ScriptFrames.get(); @@ -65,13 +65,13 @@ void ScriptFrame::InitializeFrame(void) PushFrame(this); } -ScriptFrame::~ScriptFrame(void) +ScriptFrame::~ScriptFrame() { ScriptFrame *frame = PopFrame(); ASSERT(frame == this); } -void ScriptFrame::IncreaseStackDepth(void) +void ScriptFrame::IncreaseStackDepth() { if (Depth + 1 > 300) BOOST_THROW_EXCEPTION(ScriptError("Stack overflow while evaluating expression: Recursion level too deep.")); @@ -79,12 +79,12 @@ void ScriptFrame::IncreaseStackDepth(void) Depth++; } -void ScriptFrame::DecreaseStackDepth(void) +void ScriptFrame::DecreaseStackDepth() { Depth--; } -ScriptFrame *ScriptFrame::GetCurrentFrame(void) +ScriptFrame *ScriptFrame::GetCurrentFrame() { std::stack *frames = m_ScriptFrames.get(); @@ -92,7 +92,7 @@ ScriptFrame *ScriptFrame::GetCurrentFrame(void) return frames->top(); } -ScriptFrame *ScriptFrame::PopFrame(void) +ScriptFrame *ScriptFrame::PopFrame() { std::stack *frames = m_ScriptFrames.get(); @@ -121,7 +121,7 @@ void ScriptFrame::PushFrame(ScriptFrame *frame) frames->push(frame); } -Array::Ptr ScriptFrame::GetImports(void) +Array::Ptr ScriptFrame::GetImports() { return m_Imports; } diff --git a/lib/base/scriptframe.hpp b/lib/base/scriptframe.hpp index b2aa3d057..54cb188c3 100644 --- a/lib/base/scriptframe.hpp +++ b/lib/base/scriptframe.hpp @@ -38,14 +38,14 @@ struct ScriptFrame ScriptFrame(bool allocLocals); ScriptFrame(bool allocLocals, const Value& self); - ~ScriptFrame(void); + ~ScriptFrame(); - void IncreaseStackDepth(void); - void DecreaseStackDepth(void); + void IncreaseStackDepth(); + void DecreaseStackDepth(); - static ScriptFrame *GetCurrentFrame(void); + static ScriptFrame *GetCurrentFrame(); - static Array::Ptr GetImports(void); + static Array::Ptr GetImports(); static void AddImport(const Object::Ptr& import); private: @@ -53,9 +53,9 @@ private: static Array::Ptr m_Imports; static void PushFrame(ScriptFrame *frame); - static ScriptFrame *PopFrame(void); + static ScriptFrame *PopFrame(); - void InitializeFrame(void); + void InitializeFrame(); }; } diff --git a/lib/base/scriptglobal.cpp b/lib/base/scriptglobal.cpp index 8e9cbfdd5..dccaf758c 100644 --- a/lib/base/scriptglobal.cpp +++ b/lib/base/scriptglobal.cpp @@ -85,7 +85,7 @@ bool ScriptGlobal::Exists(const String& name) return m_Globals->Contains(name); } -Dictionary::Ptr ScriptGlobal::GetGlobals(void) +Dictionary::Ptr ScriptGlobal::GetGlobals() { return m_Globals; } diff --git a/lib/base/scriptglobal.hpp b/lib/base/scriptglobal.hpp index 6705b762c..e2b5a8f41 100644 --- a/lib/base/scriptglobal.hpp +++ b/lib/base/scriptglobal.hpp @@ -40,7 +40,7 @@ public: static void WriteToFile(const String& filename); - static Dictionary::Ptr GetGlobals(void); + static Dictionary::Ptr GetGlobals(); private: static Dictionary::Ptr m_Globals; diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp index 384390879..c9521dc7f 100644 --- a/lib/base/scriptutils.cpp +++ b/lib/base/scriptutils.cpp @@ -81,7 +81,7 @@ enum MatchType MatchAny }; -void ScriptUtils::StaticInitialize(void) +void ScriptUtils::StaticInitialize() { ScriptGlobal::Set("MatchAll", MatchAll); ScriptGlobal::Set("MatchAny", MatchAny); diff --git a/lib/base/scriptutils.hpp b/lib/base/scriptutils.hpp index c9fa4a605..9515b381e 100644 --- a/lib/base/scriptutils.hpp +++ b/lib/base/scriptutils.hpp @@ -36,7 +36,7 @@ namespace icinga class ScriptUtils { public: - static void StaticInitialize(void); + static void StaticInitialize(); static String CastString(const Value& value); static double CastNumber(const Value& value); static bool CastBool(const Value& value); @@ -60,7 +60,7 @@ public: static Value GlobRecursive(const std::vector& args); private: - ScriptUtils(void); + ScriptUtils(); }; } diff --git a/lib/base/singleton.hpp b/lib/base/singleton.hpp index da5362196..6bffc4a73 100644 --- a/lib/base/singleton.hpp +++ b/lib/base/singleton.hpp @@ -35,7 +35,7 @@ template class Singleton { public: - static T *GetInstance(void) + static T *GetInstance() { /* FIXME: This relies on static initializers being atomic. */ static boost::mutex mutex; diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp index e2f16648d..fc12a0b5f 100644 --- a/lib/base/socket.cpp +++ b/lib/base/socket.cpp @@ -37,7 +37,7 @@ using namespace icinga; /** * Constructor for the Socket class. */ -Socket::Socket(void) +Socket::Socket() : m_FD(INVALID_SOCKET) { } @@ -53,7 +53,7 @@ Socket::Socket(SOCKET fd) /** * Destructor for the Socket class. */ -Socket::~Socket(void) +Socket::~Socket() { Close(); } @@ -81,7 +81,7 @@ void Socket::SetFD(SOCKET fd) * * @returns The file descriptor. */ -SOCKET Socket::GetFD(void) const +SOCKET Socket::GetFD() const { ObjectLock olock(this); @@ -91,7 +91,7 @@ SOCKET Socket::GetFD(void) const /** * Closes the socket. */ -void Socket::Close(void) +void Socket::Close() { ObjectLock olock(this); @@ -106,7 +106,7 @@ void Socket::Close(void) * * @returns An error code. */ -int Socket::GetError(void) const +int Socket::GetError() const { int opt; socklen_t optlen = sizeof(opt); @@ -158,7 +158,7 @@ String Socket::GetAddressFromSockaddr(sockaddr *address, socklen_t len) * * @returns A String describing the local address. */ -String Socket::GetClientAddress(void) +String Socket::GetClientAddress() { boost::mutex::scoped_lock lock(m_SocketMutex); @@ -198,7 +198,7 @@ String Socket::GetClientAddress(void) * * @returns A String describing the peer address. */ -String Socket::GetPeerAddress(void) +String Socket::GetPeerAddress() { boost::mutex::scoped_lock lock(m_SocketMutex); @@ -236,7 +236,7 @@ String Socket::GetPeerAddress(void) /** * Starts listening for incoming client connections. */ -void Socket::Listen(void) +void Socket::Listen() { if (listen(GetFD(), SOMAXCONN) < 0) { #ifndef _WIN32 @@ -328,7 +328,7 @@ size_t Socket::Read(void *buffer, size_t count) /** * Accepts a new client and creates a new client object for it. */ -Socket::Ptr Socket::Accept(void) +Socket::Ptr Socket::Accept() { sockaddr_storage addr; socklen_t addrlen = sizeof(addr); @@ -407,7 +407,7 @@ bool Socket::Poll(bool read, bool write, struct timeval *timeout) return (rc != 0); } -void Socket::MakeNonBlocking(void) +void Socket::MakeNonBlocking() { #ifdef _WIN32 Utility::SetNonBlockingSocket(GetFD()); diff --git a/lib/base/socket.hpp b/lib/base/socket.hpp index 066960f0f..3cea5e1f5 100644 --- a/lib/base/socket.hpp +++ b/lib/base/socket.hpp @@ -36,33 +36,33 @@ class Socket : public Object public: DECLARE_PTR_TYPEDEFS(Socket); - Socket(void); + Socket(); Socket(SOCKET fd); - ~Socket(void); + ~Socket(); - SOCKET GetFD(void) const; + SOCKET GetFD() const; - void Close(void); + void Close(); - String GetClientAddress(void); - String GetPeerAddress(void); + String GetClientAddress(); + String GetPeerAddress(); size_t Read(void *buffer, size_t size); size_t Write(const void *buffer, size_t size); - void Listen(void); - Socket::Ptr Accept(void); + void Listen(); + Socket::Ptr Accept(); bool Poll(bool read, bool write, struct timeval *timeout = nullptr); - void MakeNonBlocking(void); + void MakeNonBlocking(); static void SocketPair(SOCKET s[2]); protected: void SetFD(SOCKET fd); - int GetError(void) const; + int GetError() const; mutable boost::mutex m_SocketMutex; diff --git a/lib/base/socketevents.cpp b/lib/base/socketevents.cpp index 28ba6eac3..e54ca0e6f 100644 --- a/lib/base/socketevents.cpp +++ b/lib/base/socketevents.cpp @@ -35,7 +35,7 @@ static SocketEventEngine *l_SocketIOEngine; int SocketEvents::m_NextID = 0; -void SocketEventEngine::Start(void) +void SocketEventEngine::Start() { for (int tid = 0; tid < SOCKET_IOTHREADS; tid++) { Socket::SocketPair(m_EventFDs[tid]); @@ -77,7 +77,7 @@ void SocketEventEngine::WakeUpThread(int sid, bool wait) } } -void SocketEvents::InitializeEngine(void) +void SocketEvents::InitializeEngine() { String eventEngine = ScriptGlobal::Get("EventEngine", &Empty); @@ -119,7 +119,7 @@ SocketEvents::SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject) Register(lifesupportObject); } -SocketEvents::~SocketEvents(void) +SocketEvents::~SocketEvents() { VERIFY(m_FD == INVALID_SOCKET); } @@ -129,7 +129,7 @@ void SocketEvents::Register(Object *lifesupportObject) l_SocketIOEngine->Register(this, lifesupportObject); } -void SocketEvents::Unregister(void) +void SocketEvents::Unregister() { l_SocketIOEngine->Unregister(this); } @@ -144,7 +144,7 @@ boost::mutex& SocketEventEngine::GetMutex(int tid) return m_EventMutex[tid]; } -bool SocketEvents::IsHandlingEvents(void) const +bool SocketEvents::IsHandlingEvents() const { int tid = m_ID % SOCKET_IOTHREADS; boost::mutex::scoped_lock lock(l_SocketIOEngine->GetMutex(tid)); diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp index 28a5f9b39..0e797f54f 100644 --- a/lib/base/socketevents.hpp +++ b/lib/base/socketevents.hpp @@ -39,17 +39,17 @@ namespace icinga class SocketEvents { public: - ~SocketEvents(void); + ~SocketEvents(); virtual void OnEvent(int revents); - void Unregister(void); + void Unregister(); void ChangeEvents(int events); - bool IsHandlingEvents(void) const; + bool IsHandlingEvents() const; - void *GetEnginePrivate(void) const; + void *GetEnginePrivate() const; void SetEnginePrivate(void *priv); protected: @@ -63,7 +63,7 @@ private: static int m_NextID; - static void InitializeEngine(void); + static void InitializeEngine(); void WakeUpThread(bool wait = false); @@ -81,7 +81,7 @@ struct SocketEventDescriptor SocketEvents *EventInterface; Object *LifesupportObject; - SocketEventDescriptor(void) + SocketEventDescriptor() : Events(POLLIN), EventInterface(nullptr), LifesupportObject(nullptr) { } }; @@ -96,7 +96,7 @@ struct EventDescription class SocketEventEngine { public: - void Start(void); + void Start(); void WakeUpThread(int sid, bool wait); diff --git a/lib/base/stacktrace.cpp b/lib/base/stacktrace.cpp index c924e4200..9fb6c519e 100644 --- a/lib/base/stacktrace.cpp +++ b/lib/base/stacktrace.cpp @@ -31,7 +31,7 @@ using namespace icinga; # pragma optimize("", off) #endif /* _MSC_VER */ -StackTrace::StackTrace(void) +StackTrace::StackTrace() { #ifdef HAVE_BACKTRACE_SYMBOLS m_Count = backtrace(m_Frames, sizeof(m_Frames) / sizeof(m_Frames[0])); diff --git a/lib/base/stacktrace.hpp b/lib/base/stacktrace.hpp index b6dbd2c2d..10ff3e327 100644 --- a/lib/base/stacktrace.hpp +++ b/lib/base/stacktrace.hpp @@ -34,14 +34,14 @@ namespace icinga class StackTrace { public: - StackTrace(void); + StackTrace(); #ifdef _WIN32 explicit StackTrace(PEXCEPTION_POINTERS exi); #endif /* _WIN32 */ void Print(std::ostream& fp, int ignoreFrames = 0) const; - static void StaticInitialize(void); + static void StaticInitialize(); private: void *m_Frames[64]; diff --git a/lib/base/stdiostream.cpp b/lib/base/stdiostream.cpp index 7d45e51d6..773ee35c3 100644 --- a/lib/base/stdiostream.cpp +++ b/lib/base/stdiostream.cpp @@ -33,7 +33,7 @@ StdioStream::StdioStream(std::iostream *innerStream, bool ownsStream) : m_InnerStream(innerStream), m_OwnsStream(ownsStream) { } -StdioStream::~StdioStream(void) +StdioStream::~StdioStream() { Close(); } @@ -53,7 +53,7 @@ void StdioStream::Write(const void *buffer, size_t size) m_InnerStream->write(static_cast(buffer), size); } -void StdioStream::Close(void) +void StdioStream::Close() { Stream::Close(); @@ -63,12 +63,12 @@ void StdioStream::Close(void) } } -bool StdioStream::IsDataAvailable(void) const +bool StdioStream::IsDataAvailable() const { return !IsEof(); } -bool StdioStream::IsEof(void) const +bool StdioStream::IsEof() const { return !m_InnerStream->good(); } diff --git a/lib/base/stdiostream.hpp b/lib/base/stdiostream.hpp index a1f14ab01..6058f14bf 100644 --- a/lib/base/stdiostream.hpp +++ b/lib/base/stdiostream.hpp @@ -32,15 +32,15 @@ public: DECLARE_PTR_TYPEDEFS(StdioStream); StdioStream(std::iostream *innerStream, bool ownsStream); - ~StdioStream(void); + ~StdioStream(); virtual size_t Read(void *buffer, size_t size, bool allow_partial = false) override; virtual void Write(const void *buffer, size_t size) override; - virtual void Close(void) override; + virtual void Close() override; - virtual bool IsDataAvailable(void) const override; - virtual bool IsEof(void) const override; + virtual bool IsDataAvailable() const override; + virtual bool IsEof() const override; private: std::iostream *m_InnerStream; diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp index 8bcc79dbb..1e6b9baf1 100644 --- a/lib/base/stream.cpp +++ b/lib/base/stream.cpp @@ -30,17 +30,17 @@ void Stream::RegisterDataHandler(const std::function& BOOST_THROW_EXCEPTION(std::runtime_error("Stream does not support waiting.")); } -bool Stream::SupportsWaiting(void) const +bool Stream::SupportsWaiting() const { return false; } -bool Stream::IsDataAvailable(void) const +bool Stream::IsDataAvailable() const { return false; } -void Stream::Shutdown(void) +void Stream::Shutdown() { BOOST_THROW_EXCEPTION(std::runtime_error("Stream does not support Shutdown().")); } @@ -50,7 +50,7 @@ size_t Stream::Peek(void *buffer, size_t count, bool allow_partial) BOOST_THROW_EXCEPTION(std::runtime_error("Stream does not support Peek().")); } -void Stream::SignalDataAvailable(void) +void Stream::SignalDataAvailable() { OnDataAvailable(this); @@ -76,10 +76,10 @@ bool Stream::WaitForData(int timeout) return IsDataAvailable() || IsEof(); } -static void StreamDummyCallback(void) +static void StreamDummyCallback() { } -void Stream::Close(void) +void Stream::Close() { OnDataAvailable.disconnect_all_slots(); diff --git a/lib/base/stream.hpp b/lib/base/stream.hpp index 09a13b7dc..f8a1b6426 100644 --- a/lib/base/stream.hpp +++ b/lib/base/stream.hpp @@ -38,11 +38,11 @@ enum ConnectionRole struct StreamReadContext { - StreamReadContext(void) + StreamReadContext() : Buffer(nullptr), Size(0), MustRead(true), Eof(false) { } - ~StreamReadContext(void) + ~StreamReadContext() { free(Buffer); } @@ -108,35 +108,35 @@ public: * Causes the stream to be closed (via Close()) once all pending data has been * written. */ - virtual void Shutdown(void); + virtual void Shutdown(); /** * Closes the stream and releases resources. */ - virtual void Close(void); + virtual void Close(); /** * Checks whether we've reached the end-of-file condition. * * @returns true if EOF. */ - virtual bool IsEof(void) const = 0; + virtual bool IsEof() const = 0; /** * Waits until data can be read from the stream. */ bool WaitForData(int timeout = -1); - virtual bool SupportsWaiting(void) const; + virtual bool SupportsWaiting() const; - virtual bool IsDataAvailable(void) const; + virtual bool IsDataAvailable() const; void RegisterDataHandler(const std::function& handler); StreamReadStatus ReadLine(String *line, StreamReadContext& context, bool may_wait = false); protected: - void SignalDataAvailable(void); + void SignalDataAvailable(); private: boost::signals2::signal OnDataAvailable; diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp index 9e499fb26..de9613031 100644 --- a/lib/base/streamlogger.cpp +++ b/lib/base/streamlogger.cpp @@ -33,7 +33,7 @@ boost::mutex StreamLogger::m_Mutex; /** * Constructor for the StreamLogger class. */ -StreamLogger::StreamLogger(void) +StreamLogger::StreamLogger() : m_Stream(nullptr), m_OwnsStream(false) { } @@ -49,7 +49,7 @@ void StreamLogger::Stop(bool runtimeRemoved) /** * Destructor for the StreamLogger class. */ -StreamLogger::~StreamLogger(void) +StreamLogger::~StreamLogger() { if (m_FlushLogTimer) m_FlushLogTimer->Stop(); @@ -58,12 +58,12 @@ StreamLogger::~StreamLogger(void) delete m_Stream; } -void StreamLogger::FlushLogTimerHandler(void) +void StreamLogger::FlushLogTimerHandler() { Flush(); } -void StreamLogger::Flush(void) +void StreamLogger::Flush() { if (m_Stream) m_Stream->flush(); diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp index e89674f38..fe590bcce 100644 --- a/lib/base/streamlogger.hpp +++ b/lib/base/streamlogger.hpp @@ -38,18 +38,18 @@ class StreamLogger : public ObjectImpl public: DECLARE_OBJECT(StreamLogger); - StreamLogger(void); + StreamLogger(); virtual void Stop(bool runtimeRemoved) override; - ~StreamLogger(void); + ~StreamLogger(); void BindStream(std::ostream *stream, bool ownsStream); static void ProcessLogEntry(std::ostream& stream, const LogEntry& entry); protected: - virtual void ProcessLogEntry(const LogEntry& entry) override final; - virtual void Flush(void) override final; + void ProcessLogEntry(const LogEntry& entry) final; + void Flush(void) final; private: static boost::mutex m_Mutex; @@ -58,7 +58,7 @@ private: Timer::Ptr m_FlushLogTimer; - void FlushLogTimerHandler(void); + void FlushLogTimerHandler(); }; } diff --git a/lib/base/string-script.cpp b/lib/base/string-script.cpp index 573ff2f9f..ee975abff 100644 --- a/lib/base/string-script.cpp +++ b/lib/base/string-script.cpp @@ -27,14 +27,14 @@ using namespace icinga; -static int StringLen(void) +static int StringLen() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); String self = vframe->Self; return self.GetLength(); } -static String StringToString(void) +static String StringToString() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); return vframe->Self; @@ -57,14 +57,14 @@ static String StringSubstr(const std::vector& args) return self.SubStr(args[0]); } -static String StringUpper(void) +static String StringUpper() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); String self = vframe->Self; return boost::to_upper_copy(self); } -static String StringLower(void) +static String StringLower() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); String self = vframe->Self; @@ -125,21 +125,21 @@ static Value StringReplace(const String& search, const String& replacement) return self; } -static String StringReverse(void) +static String StringReverse() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); String self = vframe->Self; return self.Reverse(); } -static String StringTrim(void) +static String StringTrim() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); String self = vframe->Self; return self.Trim(); } -Object::Ptr String::GetPrototype(void) +Object::Ptr String::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/string.cpp b/lib/base/string.cpp index 4e8c1c1f6..675f97a60 100644 --- a/lib/base/string.cpp +++ b/lib/base/string.cpp @@ -31,7 +31,7 @@ REGISTER_BUILTIN_TYPE(String, String::GetPrototype()); const String::SizeType String::NPos = std::string::npos; -String::String(void) +String::String() : m_Data() { } @@ -66,7 +66,7 @@ String::String(Value&& other) } #endif /* _MSC_VER */ -String::~String(void) +String::~String() { } String& String::operator=(Value&& other) @@ -137,7 +137,7 @@ String& String::operator+=(char rhs) return *this; } -bool String::IsEmpty(void) const +bool String::IsEmpty() const { return m_Data.empty(); } @@ -147,32 +147,32 @@ bool String::operator<(const String& rhs) const return m_Data < rhs.m_Data; } -String::operator const std::string&(void) const +String::operator const std::string&() const { return m_Data; } -const char *String::CStr(void) const +const char *String::CStr() const { return m_Data.c_str(); } -void String::Clear(void) +void String::Clear() { m_Data.clear(); } -String::SizeType String::GetLength(void) const +String::SizeType String::GetLength() const { return m_Data.size(); } -std::string& String::GetData(void) +std::string& String::GetData() { return m_Data; } -const std::string& String::GetData(void) const +const std::string& String::GetData() const { return m_Data; } @@ -234,28 +234,28 @@ void String::Replace(String::SizeType first, String::SizeType second, const Stri m_Data.replace(first, second, str); } -String String::Trim(void) const +String String::Trim() const { String t = m_Data; boost::algorithm::trim(t); return t; } -String String::ToLower(void) const +String String::ToLower() const { String t = m_Data; boost::algorithm::to_lower(t); return t; } -String String::ToUpper(void) const +String String::ToUpper() const { String t = m_Data; boost::algorithm::to_upper(t); return t; } -String String::Reverse(void) const +String String::Reverse() const { String t = m_Data; std::reverse(t.m_Data.begin(), t.m_Data.end()); @@ -282,42 +282,42 @@ String::Iterator String::erase(String::Iterator first, String::Iterator last) return m_Data.erase(first, last); } -String::Iterator String::Begin(void) +String::Iterator String::Begin() { return m_Data.begin(); } -String::ConstIterator String::Begin(void) const +String::ConstIterator String::Begin() const { return m_Data.begin(); } -String::Iterator String::End(void) +String::Iterator String::End() { return m_Data.end(); } -String::ConstIterator String::End(void) const +String::ConstIterator String::End() const { return m_Data.end(); } -String::ReverseIterator String::RBegin(void) +String::ReverseIterator String::RBegin() { return m_Data.rbegin(); } -String::ConstReverseIterator String::RBegin(void) const +String::ConstReverseIterator String::RBegin() const { return m_Data.rbegin(); } -String::ReverseIterator String::REnd(void) +String::ReverseIterator String::REnd() { return m_Data.rend(); } -String::ConstReverseIterator String::REnd(void) const +String::ConstReverseIterator String::REnd() const { return m_Data.rend(); } diff --git a/lib/base/string.hpp b/lib/base/string.hpp index ca2cb96af..b60eb2c98 100644 --- a/lib/base/string.hpp +++ b/lib/base/string.hpp @@ -58,7 +58,7 @@ public: typedef std::string::size_type SizeType; - String(void); + String(); String(const char *data); String(const std::string& data); String(std::string&& data); @@ -70,7 +70,7 @@ public: String(Value&& other); #endif /* _MSC_VER */ - ~String(void); + ~String(); template String(InputIterator begin, InputIterator end) @@ -91,20 +91,20 @@ public: String& operator+=(const Value& rhs); String& operator+=(char rhs); - bool IsEmpty(void) const; + bool IsEmpty() const; bool operator<(const String& rhs) const; - operator const std::string&(void) const; + operator const std::string&() const; - const char *CStr(void) const; + const char *CStr() const; - void Clear(void); + void Clear(); - SizeType GetLength(void) const; + SizeType GetLength() const; - std::string& GetData(void); - const std::string& GetData(void) const; + std::string& GetData(); + const std::string& GetData() const; SizeType Find(const String& str, SizeType pos = 0) const; SizeType RFind(const String& str, SizeType pos = NPos) const; @@ -121,13 +121,13 @@ public: void Replace(SizeType first, SizeType second, const String& str); - String Trim(void) const; + String Trim() const; - String ToLower(void) const; + String ToLower() const; - String ToUpper(void) const; + String ToUpper() const; - String Reverse(void) const; + String Reverse() const; void Append(int count, char ch); @@ -143,18 +143,18 @@ public: m_Data.insert(p, first, last); } - Iterator Begin(void); - ConstIterator Begin(void) const; - Iterator End(void); - ConstIterator End(void) const; - ReverseIterator RBegin(void); - ConstReverseIterator RBegin(void) const; - ReverseIterator REnd(void); - ConstReverseIterator REnd(void) const; + Iterator Begin(); + ConstIterator Begin() const; + Iterator End(); + ConstIterator End() const; + ReverseIterator RBegin(); + ConstReverseIterator RBegin() const; + ReverseIterator REnd(); + ConstReverseIterator REnd() const; static const SizeType NPos; - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); private: std::string m_Data; diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp index b6dd6bb93..af95fa3da 100644 --- a/lib/base/sysloglogger.cpp +++ b/lib/base/sysloglogger.cpp @@ -33,7 +33,7 @@ INITIALIZE_ONCE(&SyslogLogger::StaticInitialize); std::map SyslogLogger::m_FacilityMap; -void SyslogLogger::StaticInitialize(void) +void SyslogLogger::StaticInitialize() { ScriptGlobal::Set("FacilityAuth", "LOG_AUTH"); ScriptGlobal::Set("FacilityAuthPriv", "LOG_AUTHPRIV"); @@ -89,7 +89,7 @@ void SyslogLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&) status->Set("sysloglogger", nodes); } -void SyslogLogger::OnConfigLoaded(void) +void SyslogLogger::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -146,7 +146,7 @@ void SyslogLogger::ProcessLogEntry(const LogEntry& entry) syslog(severity | m_Facility, "%s", entry.Message.CStr()); } -void SyslogLogger::Flush(void) +void SyslogLogger::Flush() { /* Nothing to do here. */ } diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp index 49c730dbf..4101dadfd 100644 --- a/lib/base/sysloglogger.hpp +++ b/lib/base/sysloglogger.hpp @@ -38,10 +38,10 @@ public: DECLARE_OBJECT(SyslogLogger); DECLARE_OBJECTNAME(SyslogLogger); - static void StaticInitialize(void); + static void StaticInitialize(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void ValidateFacility(const String& value, const ValidationUtils& utils) override; protected: @@ -49,7 +49,7 @@ protected: int m_Facility; virtual void ProcessLogEntry(const LogEntry& entry) override; - virtual void Flush(void) override; + virtual void Flush() override; }; } diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index 64fa34b4c..cca32652d 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -38,12 +38,12 @@ ThreadPool::ThreadPool(size_t max_threads) Start(); } -ThreadPool::~ThreadPool(void) +ThreadPool::~ThreadPool() { Stop(); } -void ThreadPool::Start(void) +void ThreadPool::Start() { if (!m_Stopped) return; @@ -56,7 +56,7 @@ void ThreadPool::Start(void) m_MgmtThread = std::thread(std::bind(&ThreadPool::ManagerThreadProc, this)); } -void ThreadPool::Stop(void) +void ThreadPool::Stop() { if (m_Stopped) return; @@ -219,7 +219,7 @@ bool ThreadPool::Post(const ThreadPool::WorkFunction& callback, SchedulerPolicy return true; } -void ThreadPool::ManagerThreadProc(void) +void ThreadPool::ManagerThreadProc() { std::ostringstream idbuf; idbuf << "TP #" << m_ID << " Manager"; diff --git a/lib/base/threadpool.hpp b/lib/base/threadpool.hpp index 9e3f1dc5b..34cb432cf 100644 --- a/lib/base/threadpool.hpp +++ b/lib/base/threadpool.hpp @@ -49,10 +49,10 @@ public: typedef std::function WorkFunction; ThreadPool(size_t max_threads = UINT_MAX); - ~ThreadPool(void); + ~ThreadPool(); - void Start(void); - void Stop(void); + void Start(); + void Stop(); bool Post(const WorkFunction& callback, SchedulerPolicy policy = DefaultScheduler); @@ -106,7 +106,7 @@ private: WorkerThread Threads[16]; - Queue(void) + Queue() : WaitTime(0), ServiceTime(0), TaskCount(0), Stopped(false) { } @@ -128,7 +128,7 @@ private: Queue m_Queues[QUEUECOUNT]; - void ManagerThreadProc(void); + void ManagerThreadProc(); }; } diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp index 6a35f5a28..e030bcb4d 100644 --- a/lib/base/timer.cpp +++ b/lib/base/timer.cpp @@ -37,17 +37,17 @@ public: : m_Timer(timer) { } - inline Timer *GetObject(void) const + inline Timer *GetObject() const { return m_Timer; } - inline double GetNextUnlocked(void) const + inline double GetNextUnlocked() const { return m_Timer->m_Next; } - operator Timer *(void) const + operator Timer *() const { return m_Timer; } @@ -76,19 +76,19 @@ static int l_AliveTimers; /** * Constructor for the Timer class. */ -Timer::Timer(void) +Timer::Timer() : m_Interval(0), m_Next(0), m_Started(false), m_Running(false) { } /** * Destructor for the Timer class. */ -Timer::~Timer(void) +Timer::~Timer() { Stop(true); } -void Timer::Uninitialize(void) +void Timer::Uninitialize() { { boost::mutex::scoped_lock lock(l_TimerMutex); @@ -103,7 +103,7 @@ void Timer::Uninitialize(void) /** * Calls this timer. */ -void Timer::Call(void) +void Timer::Call() { try { OnTimerExpired(Timer::Ptr(this)); @@ -132,7 +132,7 @@ void Timer::SetInterval(double interval) * * @returns The interval. */ -double Timer::GetInterval(void) const +double Timer::GetInterval() const { boost::mutex::scoped_lock lock(l_TimerMutex); return m_Interval; @@ -141,7 +141,7 @@ double Timer::GetInterval(void) const /** * Registers the timer and starts processing events for it. */ -void Timer::Start(void) +void Timer::Start() { { boost::mutex::scoped_lock lock(l_TimerMutex); @@ -232,7 +232,7 @@ void Timer::InternalReschedule(bool completed, double next) * * @returns The timestamp. */ -double Timer::GetNext(void) const +double Timer::GetNext() const { boost::mutex::scoped_lock lock(l_TimerMutex); return m_Next; @@ -275,7 +275,7 @@ void Timer::AdjustTimers(double adjustment) /** * Worker thread proc for Timer objects. */ -void Timer::TimerThreadProc(void) +void Timer::TimerThreadProc() { Utility::SetThreadName("Timer Thread"); diff --git a/lib/base/timer.hpp b/lib/base/timer.hpp index 265d8acdf..5e7555e19 100644 --- a/lib/base/timer.hpp +++ b/lib/base/timer.hpp @@ -38,21 +38,21 @@ class Timer final : public Object public: DECLARE_PTR_TYPEDEFS(Timer); - Timer(void); - ~Timer(void); + Timer(); + ~Timer(); - static void Uninitialize(void); + static void Uninitialize(); void SetInterval(double interval); - double GetInterval(void) const; + double GetInterval() const; static void AdjustTimers(double adjustment); - void Start(void); + void Start(); void Stop(bool wait = false); void Reschedule(double next = -1); - double GetNext(void) const; + double GetNext() const; boost::signals2::signal OnTimerExpired; @@ -65,7 +65,7 @@ private: void Call(); void InternalReschedule(bool completed, double next = -1); - static void TimerThreadProc(void); + static void TimerThreadProc(); friend class TimerHolder; }; diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp index 29daad4bf..cced491dd 100644 --- a/lib/base/tlsstream.cpp +++ b/lib/base/tlsstream.cpp @@ -82,7 +82,7 @@ TlsStream::TlsStream(const Socket::Ptr& socket, const String& hostname, Connecti } } -TlsStream::~TlsStream(void) +TlsStream::~TlsStream() { CloseInternal(true); } @@ -104,12 +104,12 @@ int TlsStream::ValidateCertificate(int preverify_ok, X509_STORE_CTX *ctx) return 1; } -bool TlsStream::IsVerifyOK(void) const +bool TlsStream::IsVerifyOK() const { return m_VerifyOK; } -String TlsStream::GetVerifyError(void) const +String TlsStream::GetVerifyError() const { return m_VerifyError; } @@ -119,7 +119,7 @@ String TlsStream::GetVerifyError(void) const * * @returns The X509 certificate. */ -std::shared_ptr TlsStream::GetClientCertificate(void) const +std::shared_ptr TlsStream::GetClientCertificate() const { boost::mutex::scoped_lock lock(m_Mutex); return std::shared_ptr(SSL_get_certificate(m_SSL.get()), &Utility::NullDeleter); @@ -130,7 +130,7 @@ std::shared_ptr TlsStream::GetClientCertificate(void) const * * @returns The X509 certificate. */ -std::shared_ptr TlsStream::GetPeerCertificate(void) const +std::shared_ptr TlsStream::GetPeerCertificate() const { boost::mutex::scoped_lock lock(m_Mutex); return std::shared_ptr(SSL_get_peer_certificate(m_SSL.get()), X509_free); @@ -269,7 +269,7 @@ void TlsStream::OnEvent(int revents) } } -void TlsStream::HandleError(void) const +void TlsStream::HandleError() const { if (m_ErrorOccurred) { BOOST_THROW_EXCEPTION(openssl_error() @@ -278,7 +278,7 @@ void TlsStream::HandleError(void) const } } -void TlsStream::Handshake(void) +void TlsStream::Handshake() { boost::mutex::scoped_lock lock(m_Mutex); @@ -332,7 +332,7 @@ void TlsStream::Write(const void *buffer, size_t count) ChangeEvents(POLLIN|POLLOUT); } -void TlsStream::Shutdown(void) +void TlsStream::Shutdown() { m_Shutdown = true; ChangeEvents(POLLOUT); @@ -341,7 +341,7 @@ void TlsStream::Shutdown(void) /** * Closes the stream. */ -void TlsStream::Close(void) +void TlsStream::Close() { CloseInternal(false); } @@ -374,24 +374,24 @@ void TlsStream::CloseInternal(bool inDestructor) m_CV.notify_all(); } -bool TlsStream::IsEof(void) const +bool TlsStream::IsEof() const { return m_Eof; } -bool TlsStream::SupportsWaiting(void) const +bool TlsStream::SupportsWaiting() const { return true; } -bool TlsStream::IsDataAvailable(void) const +bool TlsStream::IsDataAvailable() const { boost::mutex::scoped_lock lock(m_Mutex); return m_RecvQ->GetAvailableBytes() > 0; } -Socket::Ptr TlsStream::GetSocket(void) const +Socket::Ptr TlsStream::GetSocket() const { return m_Socket; } diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp index 6b7dd0e95..ce661979a 100644 --- a/lib/base/tlsstream.hpp +++ b/lib/base/tlsstream.hpp @@ -49,29 +49,29 @@ public: DECLARE_PTR_TYPEDEFS(TlsStream); TlsStream(const Socket::Ptr& socket, const String& hostname, ConnectionRole role, const std::shared_ptr& sslContext = MakeSSLContext()); - ~TlsStream(void); + ~TlsStream(); - Socket::Ptr GetSocket(void) const; + Socket::Ptr GetSocket() const; - std::shared_ptr GetClientCertificate(void) const; - std::shared_ptr GetPeerCertificate(void) const; + std::shared_ptr GetClientCertificate() const; + std::shared_ptr GetPeerCertificate() const; - void Handshake(void); + void Handshake(); - virtual void Close(void) override; - virtual void Shutdown(void) override; + virtual void Close() override; + virtual void Shutdown() override; virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; virtual void Write(const void *buffer, size_t count) override; - virtual bool IsEof(void) const override; + virtual bool IsEof() const override; - virtual bool SupportsWaiting(void) const override; - virtual bool IsDataAvailable(void) const override; + virtual bool SupportsWaiting() const override; + virtual bool IsDataAvailable() const override; - bool IsVerifyOK(void) const; - String GetVerifyError(void) const; + bool IsVerifyOK() const; + String GetVerifyError() const; private: std::shared_ptr m_SSL; @@ -99,7 +99,7 @@ private: virtual void OnEvent(int revents) override; - void HandleError(void) const; + void HandleError() const; static int ValidateCertificate(int preverify_ok, X509_STORE_CTX *ctx); static void NullCertificateDeleter(X509 *certificate); diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp index fcf759cb8..9529919ac 100644 --- a/lib/base/tlsutility.cpp +++ b/lib/base/tlsutility.cpp @@ -41,7 +41,7 @@ static void OpenSSLLockingCallback(int mode, int type, const char *, int) l_Mutexes[type].unlock(); } -static unsigned long OpenSSLIDCallback(void) +static unsigned long OpenSSLIDCallback() { #ifdef _WIN32 return (unsigned long)GetCurrentThreadId(); @@ -54,7 +54,7 @@ static unsigned long OpenSSLIDCallback(void) /** * Initializes the OpenSSL library. */ -void InitializeOpenSSL(void) +void InitializeOpenSSL() { if (l_SSLInitialized) return; @@ -571,7 +571,7 @@ std::shared_ptr CreateCert(EVP_PKEY *pubkey, X509_NAME *subject, X509_NAME return std::shared_ptr(cert, X509_free); } -String GetIcingaCADir(void) +String GetIcingaCADir() { return Application::GetLocalStateDir() + "/lib/icinga2/ca"; } diff --git a/lib/base/tlsutility.hpp b/lib/base/tlsutility.hpp index 23f7c93a6..18ffa7f26 100644 --- a/lib/base/tlsutility.hpp +++ b/lib/base/tlsutility.hpp @@ -36,7 +36,7 @@ namespace icinga { -void InitializeOpenSSL(void); +void InitializeOpenSSL(); std::shared_ptr MakeSSLContext(const String& pubkey = String(), const String& privkey = String(), const String& cakey = String()); void AddCRLToSSLContext(const std::shared_ptr& context, const String& crlPath); void SetCipherListToSSLContext(const std::shared_ptr& context, const String& cipherList); @@ -45,7 +45,7 @@ String GetCertificateCN(const std::shared_ptr& certificate); std::shared_ptr GetX509Certificate(const String& pemfile); int MakeX509CSR(const String& cn, const String& keyfile, const String& csrfile = String(), const String& certfile = String(), bool ca = false); std::shared_ptr CreateCert(EVP_PKEY *pubkey, X509_NAME *subject, X509_NAME *issuer, EVP_PKEY *cakey, bool ca); -String GetIcingaCADir(void); +String GetIcingaCADir(); String CertificateToString(const std::shared_ptr& cert); std::shared_ptr StringToCertificate(const String& cert); std::shared_ptr CreateCertIcingaCA(EVP_PKEY *pubkey, X509_NAME *subject); diff --git a/lib/base/type.cpp b/lib/base/type.cpp index c18ae9f9a..2d8a3fa80 100644 --- a/lib/base/type.cpp +++ b/lib/base/type.cpp @@ -32,13 +32,13 @@ INITIALIZE_ONCE_WITH_PRIORITY([]() { Type::Register(type); }, 20); -Type::Type(void) +Type::Type() { } -Type::~Type(void) +Type::~Type() { } -String Type::ToString(void) const +String Type::ToString() const { return "type '" + GetName() + "'"; } @@ -65,7 +65,7 @@ Type::Ptr Type::GetByName(const String& name) return ptype; } -std::vector Type::GetAllTypes(void) +std::vector Type::GetAllTypes() { std::vector types; @@ -83,7 +83,7 @@ std::vector Type::GetAllTypes(void) return types; } -String Type::GetPluralName(void) const +String Type::GetPluralName() const { String name = GetName(); @@ -104,7 +104,7 @@ Object::Ptr Type::Instantiate(const std::vector& args) const return factory(args); } -bool Type::IsAbstract(void) const +bool Type::IsAbstract() const { return ((GetAttributes() & TAAbstract) != 0); } @@ -119,7 +119,7 @@ bool Type::IsAssignableFrom(const Type::Ptr& other) const return false; } -Object::Ptr Type::GetPrototype(void) const +Object::Ptr Type::GetPrototype() const { return m_Prototype; } @@ -155,7 +155,7 @@ Value Type::GetField(int id) const BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID.")); } -std::vector Type::GetLoadDependencies(void) const +std::vector Type::GetLoadDependencies() const { return std::vector(); } @@ -165,17 +165,17 @@ void Type::RegisterAttributeHandler(int fieldId, const AttributeHandler& callbac throw std::runtime_error("Invalid field ID."); } -String TypeType::GetName(void) const +String TypeType::GetName() const { return "Type"; } -Type::Ptr TypeType::GetBaseType(void) const +Type::Ptr TypeType::GetBaseType() const { return Object::TypeInstance; } -int TypeType::GetAttributes(void) const +int TypeType::GetAttributes() const { return 0; } @@ -210,12 +210,12 @@ Field TypeType::GetFieldInfo(int id) const throw std::runtime_error("Invalid field ID."); } -int TypeType::GetFieldCount(void) const +int TypeType::GetFieldCount() const { return GetBaseType()->GetFieldCount() + 3; } -ObjectFactory TypeType::GetFactory(void) const +ObjectFactory TypeType::GetFactory() const { return nullptr; } diff --git a/lib/base/type.hpp b/lib/base/type.hpp index 817d347e8..54eeb802b 100644 --- a/lib/base/type.hpp +++ b/lib/base/type.hpp @@ -75,43 +75,43 @@ class Type : public Object public: DECLARE_OBJECT(Type); - Type(void); - ~Type(void); + Type(); + ~Type(); - virtual String ToString(void) const override; + virtual String ToString() const override; - virtual String GetName(void) const = 0; - virtual Type::Ptr GetBaseType(void) const = 0; - virtual int GetAttributes(void) const = 0; + virtual String GetName() const = 0; + virtual Type::Ptr GetBaseType() const = 0; + virtual int GetAttributes() const = 0; virtual int GetFieldId(const String& name) const = 0; virtual Field GetFieldInfo(int id) const = 0; - virtual int GetFieldCount(void) const = 0; + virtual int GetFieldCount() const = 0; - String GetPluralName(void) const; + String GetPluralName() const; Object::Ptr Instantiate(const std::vector& args) const; bool IsAssignableFrom(const Type::Ptr& other) const; - bool IsAbstract(void) const; + bool IsAbstract() const; - Object::Ptr GetPrototype(void) const; + Object::Ptr GetPrototype() const; void SetPrototype(const Object::Ptr& object); static void Register(const Type::Ptr& type); static Type::Ptr GetByName(const String& name); - static std::vector GetAllTypes(void); + static std::vector GetAllTypes(); virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override; virtual Value GetField(int id) const override; - virtual std::vector GetLoadDependencies(void) const; + virtual std::vector GetLoadDependencies() const; typedef std::function AttributeHandler; virtual void RegisterAttributeHandler(int fieldId, const AttributeHandler& callback); protected: - virtual ObjectFactory GetFactory(void) const = 0; + virtual ObjectFactory GetFactory() const = 0; private: Object::Ptr m_Prototype; @@ -122,17 +122,17 @@ class TypeType final : public Type public: DECLARE_PTR_TYPEDEFS(Type); - virtual String GetName(void) const override; - virtual Type::Ptr GetBaseType(void) const override; - virtual int GetAttributes(void) const override; + virtual String GetName() const override; + virtual Type::Ptr GetBaseType() const override; + virtual int GetAttributes() const override; virtual int GetFieldId(const String& name) const override; virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount(void) const override; + virtual int GetFieldCount() const override; - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); protected: - virtual ObjectFactory GetFactory(void) const override; + virtual ObjectFactory GetFactory() const override; }; template diff --git a/lib/base/typetype-script.cpp b/lib/base/typetype-script.cpp index 7fe52776e..d47a76f27 100644 --- a/lib/base/typetype-script.cpp +++ b/lib/base/typetype-script.cpp @@ -40,7 +40,7 @@ static void TypeRegisterAttributeHandler(const String& fieldName, const Function self->RegisterAttributeHandler(fid, std::bind(&InvokeAttributeHandlerHelper, callback, _1, _2)); } -Object::Ptr TypeType::GetPrototype(void) +Object::Ptr TypeType::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/base/unixsocket.cpp b/lib/base/unixsocket.cpp index 7c043e022..c5aacbc54 100644 --- a/lib/base/unixsocket.cpp +++ b/lib/base/unixsocket.cpp @@ -23,7 +23,7 @@ #ifndef _WIN32 using namespace icinga; -UnixSocket::UnixSocket(void) +UnixSocket::UnixSocket() { int fd = socket(AF_UNIX, SOCK_STREAM, 0); diff --git a/lib/base/unixsocket.hpp b/lib/base/unixsocket.hpp index 4105eee0d..ab5546b50 100644 --- a/lib/base/unixsocket.hpp +++ b/lib/base/unixsocket.hpp @@ -31,7 +31,7 @@ class UnixSocket final : public Socket public: DECLARE_PTR_TYPEDEFS(UnixSocket); - UnixSocket(void); + UnixSocket(); void Bind(const String& path); diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index a0c381ded..f80b42933 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -368,7 +368,7 @@ void Utility::IncrementTime(double diff) * * @returns The current time. */ -double Utility::GetTime(void) +double Utility::GetTime() { #ifdef I2_DEBUG if (m_DebugTime >= 0) { @@ -408,7 +408,7 @@ double Utility::GetTime(void) * * @returns The PID. */ -pid_t Utility::GetPid(void) +pid_t Utility::GetPid() { #ifndef _WIN32 return getpid(); @@ -440,7 +440,7 @@ void Utility::Sleep(double timeout) * * @returns The new unique ID. */ -String Utility::NewUniqueID(void) +String Utility::NewUniqueID() { return boost::lexical_cast(boost::uuids::random_generator()()); } @@ -915,7 +915,7 @@ void Utility::SetNonBlockingSocket(SOCKET s, bool nb) #endif /* _WIN32 */ } -void Utility::QueueAsyncCallback(const std::function& callback, SchedulerPolicy policy) +void Utility::QueueAsyncCallback(const std::function& callback, SchedulerPolicy policy) { Application::GetTP().Post(callback, policy); } @@ -1217,7 +1217,7 @@ void Utility::SetThreadName(const String& name, bool os) #endif /* HAVE_PTHREAD_SETNAME_NP */ } -String Utility::GetThreadName(void) +String Utility::GetThreadName() { String *name = m_ThreadName.get(); @@ -1269,7 +1269,7 @@ int Utility::CompareVersion(const String& v1, const String& v2) return 0; } -String Utility::GetHostName(void) +String Utility::GetHostName() { char name[255]; @@ -1285,7 +1285,7 @@ String Utility::GetHostName(void) * * @returns The FQDN. */ -String Utility::GetFQDN(void) +String Utility::GetFQDN() { String hostname = GetHostName(); @@ -1311,7 +1311,7 @@ String Utility::GetFQDN(void) return hostname; } -int Utility::Random(void) +int Utility::Random() { #ifdef _WIN32 return rand(); @@ -1663,7 +1663,7 @@ static bool ReleaseHelper(String *platformName, String *platformVersion) #endif /* _WIN32 */ } -String Utility::GetPlatformKernel(void) +String Utility::GetPlatformKernel() { #ifdef _WIN32 return "Windows"; @@ -1672,7 +1672,7 @@ String Utility::GetPlatformKernel(void) #endif /* _WIN32 */ } -String Utility::GetPlatformKernelVersion(void) +String Utility::GetPlatformKernelVersion() { #ifdef _WIN32 OSVERSIONINFO info; @@ -1688,7 +1688,7 @@ String Utility::GetPlatformKernelVersion(void) #endif /* _WIN32 */ } -String Utility::GetPlatformName(void) +String Utility::GetPlatformName() { String platformName; if (!ReleaseHelper(&platformName, nullptr)) @@ -1696,7 +1696,7 @@ String Utility::GetPlatformName(void) return platformName; } -String Utility::GetPlatformVersion(void) +String Utility::GetPlatformVersion() { String platformVersion; if (!ReleaseHelper(nullptr, &platformVersion)) @@ -1704,7 +1704,7 @@ String Utility::GetPlatformVersion(void) return platformVersion; } -String Utility::GetPlatformArchitecture(void) +String Utility::GetPlatformArchitecture() { #ifdef _WIN32 SYSTEM_INFO info; @@ -1908,7 +1908,7 @@ int Utility::MksTemp(char *tmpl) return -1; } -String Utility::GetIcingaInstallPath(void) +String Utility::GetIcingaInstallPath() { char szProduct[39]; @@ -1930,7 +1930,7 @@ String Utility::GetIcingaInstallPath(void) return ""; } -String Utility::GetIcingaDataPath(void) +String Utility::GetIcingaDataPath() { char path[MAX_PATH]; if (!SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_COMMON_APPDATA, nullptr, 0, path))) diff --git a/lib/base/utility.hpp b/lib/base/utility.hpp index a52a8d52e..dd542c30a 100644 --- a/lib/base/utility.hpp +++ b/lib/base/utility.hpp @@ -71,13 +71,13 @@ public: static void NullDeleter(void *); - static double GetTime(void); + static double GetTime(); - static pid_t GetPid(void); + static pid_t GetPid(); static void Sleep(double timeout); - static String NewUniqueID(void); + static String NewUniqueID(); static bool Glob(const String& pathSpec, const std::function& callback, int type = GlobFile | GlobDirectory); static bool GlobRecursive(const String& path, const String& pattern, const std::function& callback, int type = GlobFile | GlobDirectory); @@ -85,7 +85,7 @@ public: static void MkDirP(const String& path, int mode); static bool SetFileOwnership(const String& file, const String& user, const String& group); - static void QueueAsyncCallback(const std::function& callback, SchedulerPolicy policy = DefaultScheduler); + static void QueueAsyncCallback(const std::function& callback, SchedulerPolicy policy = DefaultScheduler); static String NaturalJoin(const std::vector& tokens); static String Join(const Array::Ptr& tokens, char separator, bool escapeSeparator = true); @@ -111,16 +111,16 @@ public: static String UnescapeString(const String& s); static void SetThreadName(const String& name, bool os = true); - static String GetThreadName(void); + static String GetThreadName(); static unsigned long SDBM(const String& str, size_t len = String::NPos); static int CompareVersion(const String& v1, const String& v2); - static int Random(void); + static int Random(); - static String GetHostName(void); - static String GetFQDN(void); + static String GetHostName(); + static String GetFQDN(); static tm LocalTime(time_t ts); @@ -132,19 +132,19 @@ public: static Value LoadJsonFile(const String& path); static void SaveJsonFile(const String& path, int mode, const Value& value); - static String GetPlatformKernel(void); - static String GetPlatformKernelVersion(void); - static String GetPlatformName(void); - static String GetPlatformVersion(void); - static String GetPlatformArchitecture(void); + static String GetPlatformKernel(); + static String GetPlatformKernelVersion(); + static String GetPlatformName(); + static String GetPlatformVersion(); + static String GetPlatformArchitecture(); static String ValidateUTF8(const String& input); static String CreateTempFile(const String& path, int mode, std::fstream& fp); #ifdef _WIN32 - static String GetIcingaInstallPath(void); - static String GetIcingaDataPath(void); + static String GetIcingaInstallPath(); + static String GetIcingaDataPath(); #endif /* _WIN32 */ #ifdef I2_DEBUG @@ -153,7 +153,7 @@ public: #endif /* I2_DEBUG */ private: - Utility(void); + Utility(); static void CollectPaths(const String& path, std::vector& paths); #ifdef _WIN32 diff --git a/lib/base/value-operators.cpp b/lib/base/value-operators.cpp index 037f44a27..78fd0757b 100644 --- a/lib/base/value-operators.cpp +++ b/lib/base/value-operators.cpp @@ -28,7 +28,7 @@ using namespace icinga; -Value::operator double(void) const +Value::operator double() const { const double *value = boost::get(&m_Value); @@ -52,7 +52,7 @@ Value::operator double(void) const } } -Value::operator String(void) const +Value::operator String() const { Object *object; diff --git a/lib/base/value.cpp b/lib/base/value.cpp index ee2f1816c..8fe55e851 100644 --- a/lib/base/value.cpp +++ b/lib/base/value.cpp @@ -25,14 +25,14 @@ using namespace icinga; template class boost::variant; -template const double& Value::Get(void) const; -template const bool& Value::Get(void) const; -template const String& Value::Get(void) const; -template const Object::Ptr& Value::Get(void) const; +template const double& Value::Get() const; +template const bool& Value::Get() const; +template const String& Value::Get() const; +template const Object::Ptr& Value::Get() const; Value icinga::Empty; -Value::Value(void) +Value::Value() { } Value::Value(std::nullptr_t) @@ -105,7 +105,7 @@ Value::Value(const intrusive_ptr& value) m_Value = value; } -Value::~Value(void) +Value::~Value() { } Value& Value::operator=(const Value& other) @@ -130,7 +130,7 @@ Value& Value::operator=(Value&& other) * * @returns true if the variant is empty, false otherwise. */ -bool Value::IsEmpty(void) const +bool Value::IsEmpty() const { return (GetType() == ValueEmpty || (IsString() && boost::get(m_Value).IsEmpty())); } @@ -140,7 +140,7 @@ bool Value::IsEmpty(void) const * * @returns true if the variant is scalar, false otherwise. */ -bool Value::IsScalar(void) const +bool Value::IsScalar() const { return !IsEmpty() && !IsObject(); } @@ -150,7 +150,7 @@ bool Value::IsScalar(void) const * * @returns true if the variant is a number. */ -bool Value::IsNumber(void) const +bool Value::IsNumber() const { return (GetType() == ValueNumber); } @@ -160,7 +160,7 @@ bool Value::IsNumber(void) const * * @returns true if the variant is a boolean. */ -bool Value::IsBoolean(void) const +bool Value::IsBoolean() const { return (GetType() == ValueBoolean); } @@ -170,7 +170,7 @@ bool Value::IsBoolean(void) const * * @returns true if the variant is a string. */ -bool Value::IsString(void) const +bool Value::IsString() const { return (GetType() == ValueString); } @@ -180,7 +180,7 @@ bool Value::IsString(void) const * * @returns true if the variant is a non-null object, false otherwise. */ -bool Value::IsObject(void) const +bool Value::IsObject() const { return (GetType() == ValueObject); } @@ -190,7 +190,7 @@ bool Value::IsObject(void) const * * @returns The type. */ -ValueType Value::GetType(void) const +ValueType Value::GetType() const { return static_cast(m_Value.which()); } @@ -200,7 +200,7 @@ void Value::Swap(Value& other) m_Value.swap(other.m_Value); } -bool Value::ToBool(void) const +bool Value::ToBool() const { switch (GetType()) { case ValueNumber: @@ -231,7 +231,7 @@ bool Value::ToBool(void) const } } -String Value::GetTypeName(void) const +String Value::GetTypeName() const { Type::Ptr t; @@ -260,7 +260,7 @@ String Value::GetTypeName(void) const } } -Type::Ptr Value::GetReflectionType(void) const +Type::Ptr Value::GetReflectionType() const { switch (GetType()) { case ValueEmpty: @@ -278,7 +278,7 @@ Type::Ptr Value::GetReflectionType(void) const } } -Value Value::Clone(void) const +Value Value::Clone() const { if (IsObject()) return static_cast(*this)->Clone(); diff --git a/lib/base/value.hpp b/lib/base/value.hpp index 07c62c174..ab848da0e 100644 --- a/lib/base/value.hpp +++ b/lib/base/value.hpp @@ -52,7 +52,7 @@ enum ValueType class Value { public: - Value(void); + Value(); Value(std::nullptr_t); Value(int value); Value(unsigned int value); @@ -77,12 +77,12 @@ public: static_assert(!std::is_same::value, "T must not be Object"); } - ~Value(void); + ~Value(); - bool ToBool(void) const; + bool ToBool() const; - operator double(void) const; - operator String(void) const; + operator double() const; + operator String() const; Value& operator=(const Value& other); Value& operator=(Value&& other); @@ -106,7 +106,7 @@ public: bool operator!=(const Value& rhs) const; template - operator intrusive_ptr(void) const + operator intrusive_ptr() const { if (IsEmpty() && !IsString()) return intrusive_ptr(); @@ -126,15 +126,15 @@ public: return tobject; } - bool IsEmpty(void) const; - bool IsScalar(void) const; - bool IsNumber(void) const; - bool IsBoolean(void) const; - bool IsString(void) const; - bool IsObject(void) const; + bool IsEmpty() const; + bool IsScalar() const; + bool IsNumber() const; + bool IsBoolean() const; + bool IsString() const; + bool IsObject() const; template - bool IsObjectType(void) const + bool IsObjectType() const { if (!IsObject()) return false; @@ -142,18 +142,18 @@ public: return dynamic_cast(Get().get()); } - ValueType GetType(void) const; + ValueType GetType() const; void Swap(Value& other); - String GetTypeName(void) const; + String GetTypeName() const; - Type::Ptr GetReflectionType(void) const; + Type::Ptr GetReflectionType() const; - Value Clone(void) const; + Value Clone() const; template - const T& Get(void) const + const T& Get() const { return boost::get(m_Value); } @@ -162,10 +162,10 @@ private: boost::variant m_Value; }; -extern template const double& Value::Get(void) const; -extern template const bool& Value::Get(void) const; -extern template const String& Value::Get(void) const; -extern template const Object::Ptr& Value::Get(void) const; +extern template const double& Value::Get() const; +extern template const bool& Value::Get() const; +extern template const String& Value::Get() const; +extern template const Object::Ptr& Value::Get() const; extern Value Empty; diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index 01cf8ce2e..53291862b 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -43,7 +43,7 @@ WorkQueue::WorkQueue(size_t maxItems, int threadCount) m_StatusTimer->Start(); } -WorkQueue::~WorkQueue(void) +WorkQueue::~WorkQueue() { m_StatusTimer->Stop(true); @@ -55,7 +55,7 @@ void WorkQueue::SetName(const String& name) m_Name = name; } -String WorkQueue::GetName(void) const +String WorkQueue::GetName() const { return m_Name; } @@ -66,7 +66,7 @@ String WorkQueue::GetName(void) const * allowInterleaved is true in which case the new task might be run * immediately if it's being enqueued from within the WorkQueue thread. */ -void WorkQueue::Enqueue(std::function&& function, WorkQueuePriority priority, +void WorkQueue::Enqueue(std::function&& function, WorkQueuePriority priority, bool allowInterleaved) { bool wq_thread = IsWorkerThread(); @@ -132,7 +132,7 @@ void WorkQueue::Join(bool stop) * * @returns true if called from one of the worker threads, false otherwise */ -bool WorkQueue::IsWorkerThread(void) const +bool WorkQueue::IsWorkerThread() const { WorkQueue **pwq = l_ThreadWorkQueue.get(); @@ -152,7 +152,7 @@ void WorkQueue::SetExceptionCallback(const ExceptionCallback& callback) * work queue. When a custom exception callback is set this method will always * return false. */ -bool WorkQueue::HasExceptions(void) const +bool WorkQueue::HasExceptions() const { boost::mutex::scoped_lock lock(m_Mutex); @@ -163,7 +163,7 @@ bool WorkQueue::HasExceptions(void) const * Returns all exceptions which have occurred for tasks in this work queue. When a * custom exception callback is set this method will always return an empty list. */ -std::vector WorkQueue::GetExceptions(void) const +std::vector WorkQueue::GetExceptions() const { boost::mutex::scoped_lock lock(m_Mutex); @@ -183,14 +183,14 @@ void WorkQueue::ReportExceptions(const String& facility) const << exceptions.size() << " error" << (exceptions.size() != 1 ? "s" : ""); } -size_t WorkQueue::GetLength(void) const +size_t WorkQueue::GetLength() const { boost::mutex::scoped_lock lock(m_Mutex); return m_Tasks.size(); } -void WorkQueue::StatusTimerHandler(void) +void WorkQueue::StatusTimerHandler() { boost::mutex::scoped_lock lock(m_Mutex); @@ -231,7 +231,7 @@ void WorkQueue::StatusTimerHandler(void) } } -void WorkQueue::WorkerThreadProc(void) +void WorkQueue::WorkerThreadProc() { std::ostringstream idbuf; idbuf << "WQ #" << m_ID; @@ -286,7 +286,7 @@ void WorkQueue::WorkerThreadProc(void) } } -void WorkQueue::IncreaseTaskCount(void) +void WorkQueue::IncreaseTaskCount() { double now = Utility::GetTime(); diff --git a/lib/base/workqueue.hpp b/lib/base/workqueue.hpp index 781eaba5a..82d4e2dfe 100644 --- a/lib/base/workqueue.hpp +++ b/lib/base/workqueue.hpp @@ -43,7 +43,7 @@ enum WorkQueuePriority struct Task { - Task(void) + Task() : Priority(PriorityNormal), ID(-1) { } @@ -82,28 +82,28 @@ public: typedef std::function ExceptionCallback; WorkQueue(size_t maxItems = 0, int threadCount = 1); - ~WorkQueue(void); + ~WorkQueue(); void SetName(const String& name); - String GetName(void) const; + String GetName() const; void Enqueue(std::function&& function, WorkQueuePriority priority = PriorityNormal, bool allowInterleaved = false); void Join(bool stop = false); - bool IsWorkerThread(void) const; + bool IsWorkerThread() const; - size_t GetLength(void) const; + size_t GetLength() const; size_t GetTaskCount(RingBuffer::SizeType span); void SetExceptionCallback(const ExceptionCallback& callback); - bool HasExceptions(void) const; - std::vector GetExceptions(void) const; + bool HasExceptions() const; + std::vector GetExceptions() const; void ReportExceptions(const String& facility) const; protected: - void IncreaseTaskCount(void); + void IncreaseTaskCount(); private: int m_ID; @@ -132,8 +132,8 @@ private: size_t m_PendingTasks; double m_PendingTasksTimestamp; - void WorkerThreadProc(void); - void StatusTimerHandler(void); + void WorkerThreadProc(); + void StatusTimerHandler(); }; } diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp index 468bf3baa..e9cbf998d 100644 --- a/lib/checker/checkercomponent.cpp +++ b/lib/checker/checkercomponent.cpp @@ -59,11 +59,11 @@ void CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr status->Set("checkercomponent", nodes); } -CheckerComponent::CheckerComponent(void) +CheckerComponent::CheckerComponent() : m_Stopped(false) { } -void CheckerComponent::OnConfigLoaded(void) +void CheckerComponent::OnConfigLoaded() { ConfigObject::OnActiveChanged.connect(std::bind(&CheckerComponent::ObjectHandler, this, _1)); ConfigObject::OnPausedChanged.connect(std::bind(&CheckerComponent::ObjectHandler, this, _1)); @@ -104,7 +104,7 @@ void CheckerComponent::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -void CheckerComponent::CheckThreadProc(void) +void CheckerComponent::CheckThreadProc() { Utility::SetThreadName("Check Scheduler"); @@ -252,7 +252,7 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable) << "Check finished for object '" << checkable->GetName() << "'"; } -void CheckerComponent::ResultTimerHandler(void) +void CheckerComponent::ResultTimerHandler() { std::ostringstream msgbuf; @@ -322,14 +322,14 @@ void CheckerComponent::NextCheckChangedHandler(const Checkable::Ptr& checkable) m_CV.notify_all(); } -unsigned long CheckerComponent::GetIdleCheckables(void) +unsigned long CheckerComponent::GetIdleCheckables() { boost::mutex::scoped_lock lock(m_Mutex); return m_IdleCheckables.size(); } -unsigned long CheckerComponent::GetPendingCheckables(void) +unsigned long CheckerComponent::GetPendingCheckables() { boost::mutex::scoped_lock lock(m_Mutex); diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp index 87823ce09..02cfef1cc 100644 --- a/lib/checker/checkercomponent.hpp +++ b/lib/checker/checkercomponent.hpp @@ -77,15 +77,15 @@ public: > > CheckableSet; - CheckerComponent(void); + CheckerComponent(); - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - unsigned long GetIdleCheckables(void); - unsigned long GetPendingCheckables(void); + unsigned long GetIdleCheckables(); + unsigned long GetPendingCheckables(); private: boost::mutex m_Mutex; @@ -98,17 +98,17 @@ private: Timer::Ptr m_ResultTimer; - void CheckThreadProc(void); - void ResultTimerHandler(void); + void CheckThreadProc(); + void ResultTimerHandler(); void ExecuteCheckHelper(const Checkable::Ptr& checkable); - void AdjustCheckTimer(void); + void AdjustCheckTimer(); void ObjectHandler(const ConfigObject::Ptr& object); void NextCheckChangedHandler(const Checkable::Ptr& checkable); - void RescheduleCheckTimer(void); + void RescheduleCheckTimer(); static CheckableScheduleInfo GetCheckableScheduleInfo(const Checkable::Ptr& checkable); }; diff --git a/lib/cli/apisetupcommand.cpp b/lib/cli/apisetupcommand.cpp index daacca576..1345dc92b 100644 --- a/lib/cli/apisetupcommand.cpp +++ b/lib/cli/apisetupcommand.cpp @@ -29,22 +29,22 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("api/setup", ApiSetupCommand); -String ApiSetupCommand::GetDescription(void) const +String ApiSetupCommand::GetDescription() const { return "Setup for Icinga 2 API."; } -String ApiSetupCommand::GetShortDescription(void) const +String ApiSetupCommand::GetShortDescription() const { return "setup for api"; } -ImpersonationLevel ApiSetupCommand::GetImpersonationLevel(void) const +ImpersonationLevel ApiSetupCommand::GetImpersonationLevel() const { return ImpersonateRoot; } -int ApiSetupCommand::GetMaxArguments(void) const +int ApiSetupCommand::GetMaxArguments() const { return -1; } diff --git a/lib/cli/apisetupcommand.hpp b/lib/cli/apisetupcommand.hpp index 5af132db3..63787a5d1 100644 --- a/lib/cli/apisetupcommand.hpp +++ b/lib/cli/apisetupcommand.hpp @@ -35,11 +35,11 @@ class ApiSetupCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ApiSetupCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual int GetMaxArguments(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual int GetMaxArguments() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; }; } diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp index 8450b78d8..29983226c 100644 --- a/lib/cli/apisetuputility.cpp +++ b/lib/cli/apisetuputility.cpp @@ -38,7 +38,7 @@ using namespace icinga; -String ApiSetupUtility::GetConfdPath(void) +String ApiSetupUtility::GetConfdPath() { return Application::GetSysconfDir() + "/icinga2/conf.d"; } @@ -145,7 +145,7 @@ bool ApiSetupUtility::SetupMasterCertificates(const String& cn) return true; } -bool ApiSetupUtility::SetupMasterApiUser(void) +bool ApiSetupUtility::SetupMasterApiUser() { String api_username = "root"; // TODO make this available as cli parameter? String api_password = RandomString(8); @@ -191,7 +191,7 @@ bool ApiSetupUtility::SetupMasterApiUser(void) return true; } -bool ApiSetupUtility::SetupMasterEnableApi(void) +bool ApiSetupUtility::SetupMasterEnableApi() { Log(LogInformation, "cli", "Enabling the 'api' feature."); diff --git a/lib/cli/apisetuputility.hpp b/lib/cli/apisetuputility.hpp index 46bf453da..eeacd8daa 100644 --- a/lib/cli/apisetuputility.hpp +++ b/lib/cli/apisetuputility.hpp @@ -40,14 +40,14 @@ public: static bool SetupMaster(const String& cn, bool prompt_restart = false); static bool SetupMasterCertificates(const String& cn); - static bool SetupMasterApiUser(void); - static bool SetupMasterEnableApi(void); + static bool SetupMasterApiUser(); + static bool SetupMasterEnableApi(); static bool SetupMasterUpdateConstants(const String& cn); - static String GetConfdPath(void); + static String GetConfdPath(); private: - ApiSetupUtility(void); + ApiSetupUtility(); }; } diff --git a/lib/cli/calistcommand.cpp b/lib/cli/calistcommand.cpp index 363b83477..8d9caf382 100644 --- a/lib/cli/calistcommand.cpp +++ b/lib/cli/calistcommand.cpp @@ -31,12 +31,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("ca/list", CAListCommand); -String CAListCommand::GetDescription(void) const +String CAListCommand::GetDescription() const { return "Lists all certificate signing requests."; } -String CAListCommand::GetShortDescription(void) const +String CAListCommand::GetShortDescription() const { return "lists all certificate signing requests"; } diff --git a/lib/cli/calistcommand.hpp b/lib/cli/calistcommand.hpp index bc56fdc55..517133819 100644 --- a/lib/cli/calistcommand.hpp +++ b/lib/cli/calistcommand.hpp @@ -35,8 +35,8 @@ class CAListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(CAListCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; diff --git a/lib/cli/casigncommand.cpp b/lib/cli/casigncommand.cpp index 81f5621f0..57c11d8f8 100644 --- a/lib/cli/casigncommand.cpp +++ b/lib/cli/casigncommand.cpp @@ -27,22 +27,22 @@ using namespace icinga; REGISTER_CLICOMMAND("ca/sign", CASignCommand); -String CASignCommand::GetDescription(void) const +String CASignCommand::GetDescription() const { return "Signs an outstanding certificate request."; } -String CASignCommand::GetShortDescription(void) const +String CASignCommand::GetShortDescription() const { return "signs an outstanding certificate request"; } -int CASignCommand::GetMinArguments(void) const +int CASignCommand::GetMinArguments() const { return 1; } -ImpersonationLevel CASignCommand::GetImpersonationLevel(void) const +ImpersonationLevel CASignCommand::GetImpersonationLevel() const { return ImpersonateIcinga; } diff --git a/lib/cli/casigncommand.hpp b/lib/cli/casigncommand.hpp index 3cc785bbc..a45fc0b9d 100644 --- a/lib/cli/casigncommand.hpp +++ b/lib/cli/casigncommand.hpp @@ -35,10 +35,10 @@ class CASignCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(CASignCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual int GetMinArguments(void) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual int GetMinArguments() const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/clicommand.cpp b/lib/cli/clicommand.cpp index d86e65422..ece65d4e6 100644 --- a/lib/cli/clicommand.cpp +++ b/lib/cli/clicommand.cpp @@ -92,33 +92,33 @@ std::vector icinga::GetFieldCompletionSuggestions(const Type::Ptr& type, return result; } -int CLICommand::GetMinArguments(void) const +int CLICommand::GetMinArguments() const { return 0; } -int CLICommand::GetMaxArguments(void) const +int CLICommand::GetMaxArguments() const { return GetMinArguments(); } -bool CLICommand::IsHidden(void) const +bool CLICommand::IsHidden() const { return false; } -bool CLICommand::IsDeprecated(void) const +bool CLICommand::IsDeprecated() const { return false; } -boost::mutex& CLICommand::GetRegistryMutex(void) +boost::mutex& CLICommand::GetRegistryMutex() { static boost::mutex mtx; return mtx; } -std::map, CLICommand::Ptr>& CLICommand::GetRegistry(void) +std::map, CLICommand::Ptr>& CLICommand::GetRegistry() { static std::map, CLICommand::Ptr> registry; return registry; @@ -162,7 +162,7 @@ void CLICommand::InitParameters(boost::program_options::options_description& vis boost::program_options::options_description& hiddenDesc) const { } -ImpersonationLevel CLICommand::GetImpersonationLevel(void) const +ImpersonationLevel CLICommand::GetImpersonationLevel() const { return ImpersonateIcinga; } diff --git a/lib/cli/clicommand.hpp b/lib/cli/clicommand.hpp index e00baaf99..ef0ef7644 100644 --- a/lib/cli/clicommand.hpp +++ b/lib/cli/clicommand.hpp @@ -54,15 +54,15 @@ public: typedef std::vector(*ArgumentCompletionCallback)(const String&, const String&); - virtual String GetDescription(void) const = 0; - virtual String GetShortDescription(void) const = 0; - virtual int GetMinArguments(void) const; - virtual int GetMaxArguments(void) const; - virtual bool IsHidden(void) const; - virtual bool IsDeprecated(void) const; + virtual String GetDescription() const = 0; + virtual String GetShortDescription() const = 0; + virtual int GetMinArguments() const; + virtual int GetMaxArguments() const; + virtual bool IsHidden() const; + virtual bool IsDeprecated() const; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; + virtual ImpersonationLevel GetImpersonationLevel() const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const = 0; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector GetPositionalSuggestions(const String& word) const; @@ -83,8 +83,8 @@ public: bool autocomplete = false, int autoindex = -1); private: - static boost::mutex& GetRegistryMutex(void); - static std::map, CLICommand::Ptr>& GetRegistry(void); + static boost::mutex& GetRegistryMutex(); + static std::map, CLICommand::Ptr>& GetRegistry(); }; #define REGISTER_CLICOMMAND(name, klass) \ diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp index e5664eef8..c46944847 100644 --- a/lib/cli/consolecommand.cpp +++ b/lib/cli/consolecommand.cpp @@ -48,7 +48,7 @@ REGISTER_CLICOMMAND("console", ConsoleCommand); INITIALIZE_ONCE(&ConsoleCommand::StaticInitialize); -extern "C" void dbg_spawn_console(void) +extern "C" void dbg_spawn_console() { ScriptFrame frame(true); ConsoleCommand::RunScriptConsole(frame); @@ -142,22 +142,22 @@ void ConsoleCommand::BreakpointHandler(ScriptFrame& frame, ScriptError *ex, cons ConsoleCommand::RunScriptConsole(frame); } -void ConsoleCommand::StaticInitialize(void) +void ConsoleCommand::StaticInitialize() { Expression::OnBreakpoint.connect(&ConsoleCommand::BreakpointHandler); } -String ConsoleCommand::GetDescription(void) const +String ConsoleCommand::GetDescription() const { return "Interprets Icinga script expressions."; } -String ConsoleCommand::GetShortDescription(void) const +String ConsoleCommand::GetShortDescription() const { return "Icinga console"; } -ImpersonationLevel ConsoleCommand::GetImpersonationLevel(void) const +ImpersonationLevel ConsoleCommand::GetImpersonationLevel() const { return ImpersonateNone; } diff --git a/lib/cli/consolecommand.hpp b/lib/cli/consolecommand.hpp index c6ea320cd..8a49e5b8b 100644 --- a/lib/cli/consolecommand.hpp +++ b/lib/cli/consolecommand.hpp @@ -37,11 +37,11 @@ class ConsoleCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ConsoleCommand); - static void StaticInitialize(void); + static void StaticInitialize(); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp index d9f71009e..859febdc3 100644 --- a/lib/cli/daemoncommand.cpp +++ b/lib/cli/daemoncommand.cpp @@ -52,7 +52,7 @@ static void SigHupHandler(int) } #endif /* _WIN32 */ -static bool Daemonize(void) +static bool Daemonize() { #ifndef _WIN32 Application::UninitializeBase(); @@ -169,12 +169,12 @@ static void TerminateAndWaitForEnd(pid_t target) #endif /* _WIN32 */ } -String DaemonCommand::GetDescription(void) const +String DaemonCommand::GetDescription() const { return "Starts Icinga 2."; } -String DaemonCommand::GetShortDescription(void) const +String DaemonCommand::GetShortDescription() const { return "starts Icinga 2"; } diff --git a/lib/cli/daemoncommand.hpp b/lib/cli/daemoncommand.hpp index e919d8f1b..ab257f68f 100644 --- a/lib/cli/daemoncommand.hpp +++ b/lib/cli/daemoncommand.hpp @@ -35,8 +35,8 @@ class DaemonCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(DaemonCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; diff --git a/lib/cli/featuredisablecommand.cpp b/lib/cli/featuredisablecommand.cpp index 8a800cb83..54a702c3d 100644 --- a/lib/cli/featuredisablecommand.cpp +++ b/lib/cli/featuredisablecommand.cpp @@ -26,12 +26,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("feature/disable", FeatureDisableCommand); -String FeatureDisableCommand::GetDescription(void) const +String FeatureDisableCommand::GetDescription() const { return "Disables specified Icinga 2 feature."; } -String FeatureDisableCommand::GetShortDescription(void) const +String FeatureDisableCommand::GetShortDescription() const { return "disables specified feature"; } @@ -41,17 +41,17 @@ std::vector FeatureDisableCommand::GetPositionalSuggestions(const String return FeatureUtility::GetFieldCompletionSuggestions(word, false); } -int FeatureDisableCommand::GetMinArguments(void) const +int FeatureDisableCommand::GetMinArguments() const { return 1; } -int FeatureDisableCommand::GetMaxArguments(void) const +int FeatureDisableCommand::GetMaxArguments() const { return -1; } -ImpersonationLevel FeatureDisableCommand::GetImpersonationLevel(void) const +ImpersonationLevel FeatureDisableCommand::GetImpersonationLevel() const { return ImpersonateRoot; } diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp index f8d55a353..8bcf49929 100644 --- a/lib/cli/featuredisablecommand.hpp +++ b/lib/cli/featuredisablecommand.hpp @@ -35,12 +35,12 @@ class FeatureDisableCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureDisableCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual int GetMinArguments(void) const override; - virtual int GetMaxArguments(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual int GetMinArguments() const override; + virtual int GetMaxArguments() const override; virtual std::vector GetPositionalSuggestions(const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/featureenablecommand.cpp b/lib/cli/featureenablecommand.cpp index 991ab941a..244bbdb95 100644 --- a/lib/cli/featureenablecommand.cpp +++ b/lib/cli/featureenablecommand.cpp @@ -26,12 +26,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("feature/enable", FeatureEnableCommand); -String FeatureEnableCommand::GetDescription(void) const +String FeatureEnableCommand::GetDescription() const { return "Enables specified Icinga 2 feature."; } -String FeatureEnableCommand::GetShortDescription(void) const +String FeatureEnableCommand::GetShortDescription() const { return "enables specified feature"; } @@ -41,17 +41,17 @@ std::vector FeatureEnableCommand::GetPositionalSuggestions(const String& return FeatureUtility::GetFieldCompletionSuggestions(word, true); } -int FeatureEnableCommand::GetMinArguments(void) const +int FeatureEnableCommand::GetMinArguments() const { return 1; } -int FeatureEnableCommand::GetMaxArguments(void) const +int FeatureEnableCommand::GetMaxArguments() const { return -1; } -ImpersonationLevel FeatureEnableCommand::GetImpersonationLevel(void) const +ImpersonationLevel FeatureEnableCommand::GetImpersonationLevel() const { return ImpersonateRoot; } diff --git a/lib/cli/featureenablecommand.hpp b/lib/cli/featureenablecommand.hpp index e727c3536..24417ac47 100644 --- a/lib/cli/featureenablecommand.hpp +++ b/lib/cli/featureenablecommand.hpp @@ -35,12 +35,12 @@ class FeatureEnableCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureEnableCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual int GetMinArguments(void) const override; - virtual int GetMaxArguments(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual int GetMinArguments() const override; + virtual int GetMaxArguments() const override; virtual std::vector GetPositionalSuggestions(const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/featurelistcommand.cpp b/lib/cli/featurelistcommand.cpp index 0095032e2..33e4e96ad 100644 --- a/lib/cli/featurelistcommand.cpp +++ b/lib/cli/featurelistcommand.cpp @@ -30,12 +30,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("feature/list", FeatureListCommand); -String FeatureListCommand::GetDescription(void) const +String FeatureListCommand::GetDescription() const { return "Lists all available Icinga 2 features."; } -String FeatureListCommand::GetShortDescription(void) const +String FeatureListCommand::GetShortDescription() const { return "lists all available features"; } diff --git a/lib/cli/featurelistcommand.hpp b/lib/cli/featurelistcommand.hpp index 1fa0b4f92..75882fcf1 100644 --- a/lib/cli/featurelistcommand.hpp +++ b/lib/cli/featurelistcommand.hpp @@ -35,8 +35,8 @@ class FeatureListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureListCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/featureutility.cpp b/lib/cli/featureutility.cpp index 1c5c562c4..5de595369 100644 --- a/lib/cli/featureutility.cpp +++ b/lib/cli/featureutility.cpp @@ -28,12 +28,12 @@ using namespace icinga; -String FeatureUtility::GetFeaturesAvailablePath(void) +String FeatureUtility::GetFeaturesAvailablePath() { return Application::GetSysconfDir() + "/icinga2/features-available"; } -String FeatureUtility::GetFeaturesEnabledPath(void) +String FeatureUtility::GetFeaturesEnabledPath() { return Application::GetSysconfDir() + "/icinga2/features-enabled"; } diff --git a/lib/cli/featureutility.hpp b/lib/cli/featureutility.hpp index 281d62ca4..38f91cce0 100644 --- a/lib/cli/featureutility.hpp +++ b/lib/cli/featureutility.hpp @@ -35,8 +35,8 @@ namespace icinga class FeatureUtility { public: - static String GetFeaturesAvailablePath(void); - static String GetFeaturesEnabledPath(void); + static String GetFeaturesAvailablePath(); + static String GetFeaturesEnabledPath(); static std::vector GetFieldCompletionSuggestions(const String& word, bool enable); @@ -49,7 +49,7 @@ public: static bool CheckFeatureDisabled(const String& feature); private: - FeatureUtility(void); + FeatureUtility(); static void CollectFeatures(const String& feature_file, std::vector& features); static bool CheckFeatureInternal(const String& feature, bool check_disabled); }; diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp index b9c660cd8..01c004545 100644 --- a/lib/cli/nodesetupcommand.cpp +++ b/lib/cli/nodesetupcommand.cpp @@ -43,12 +43,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("node/setup", NodeSetupCommand); -String NodeSetupCommand::GetDescription(void) const +String NodeSetupCommand::GetDescription() const { return "Sets up an Icinga 2 node."; } -String NodeSetupCommand::GetShortDescription(void) const +String NodeSetupCommand::GetShortDescription() const { return "set up node"; } @@ -84,7 +84,7 @@ std::vector NodeSetupCommand::GetArgumentSuggestions(const String& argum return CLICommand::GetArgumentSuggestions(argument, word); } -ImpersonationLevel NodeSetupCommand::GetImpersonationLevel(void) const +ImpersonationLevel NodeSetupCommand::GetImpersonationLevel() const { return ImpersonateRoot; } diff --git a/lib/cli/nodesetupcommand.hpp b/lib/cli/nodesetupcommand.hpp index afa76e1e6..4f0e6c890 100644 --- a/lib/cli/nodesetupcommand.hpp +++ b/lib/cli/nodesetupcommand.hpp @@ -35,12 +35,12 @@ class NodeSetupCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeSetupCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: diff --git a/lib/cli/nodeutility.cpp b/lib/cli/nodeutility.cpp index 65cdac97e..1a028f9f1 100644 --- a/lib/cli/nodeutility.cpp +++ b/lib/cli/nodeutility.cpp @@ -43,7 +43,7 @@ using namespace icinga; -String NodeUtility::GetConstantsConfPath(void) +String NodeUtility::GetConstantsConfPath() { return Application::GetSysconfDir() + "/icinga2/constants.conf"; } diff --git a/lib/cli/nodeutility.hpp b/lib/cli/nodeutility.hpp index 403699d16..c9339bf1e 100644 --- a/lib/cli/nodeutility.hpp +++ b/lib/cli/nodeutility.hpp @@ -37,7 +37,7 @@ namespace icinga class NodeUtility { public: - static String GetConstantsConfPath(void); + static String GetConstantsConfPath(); static bool CreateBackupFile(const String& target, bool is_private = false); @@ -50,7 +50,7 @@ public: static int GenerateNodeMasterIcingaConfig(const std::vector& globalZones); private: - NodeUtility(void); + NodeUtility(); static void SerializeObject(std::ostream& fp, const Dictionary::Ptr& object); }; diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp index 634b7ed59..a91688644 100644 --- a/lib/cli/nodewizardcommand.cpp +++ b/lib/cli/nodewizardcommand.cpp @@ -42,22 +42,22 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("node/wizard", NodeWizardCommand); -String NodeWizardCommand::GetDescription(void) const +String NodeWizardCommand::GetDescription() const { return "Wizard for Icinga 2 node setup."; } -String NodeWizardCommand::GetShortDescription(void) const +String NodeWizardCommand::GetShortDescription() const { return "wizard for node setup"; } -ImpersonationLevel NodeWizardCommand::GetImpersonationLevel(void) const +ImpersonationLevel NodeWizardCommand::GetImpersonationLevel() const { return ImpersonateRoot; } -int NodeWizardCommand::GetMaxArguments(void) const +int NodeWizardCommand::GetMaxArguments() const { return -1; } @@ -143,7 +143,7 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm, return 0; } -int NodeWizardCommand::ClientSetup(void) const +int NodeWizardCommand::ClientSetup() const { std::string answer; String choice; @@ -541,7 +541,7 @@ wizard_ticket: return 0; } -int NodeWizardCommand::MasterSetup(void) const +int NodeWizardCommand::MasterSetup() const { std::string answer; String choice; diff --git a/lib/cli/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp index 6ef479037..7377fe32d 100644 --- a/lib/cli/nodewizardcommand.hpp +++ b/lib/cli/nodewizardcommand.hpp @@ -35,17 +35,17 @@ class NodeWizardCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeWizardCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual int GetMaxArguments(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual int GetMaxArguments() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual ImpersonationLevel GetImpersonationLevel() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; private: - int ClientSetup(void) const; - int MasterSetup(void) const; + int ClientSetup() const; + int MasterSetup() const; }; } diff --git a/lib/cli/objectlistcommand.cpp b/lib/cli/objectlistcommand.cpp index 4096e2136..f5e46448c 100644 --- a/lib/cli/objectlistcommand.cpp +++ b/lib/cli/objectlistcommand.cpp @@ -41,12 +41,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("object/list", ObjectListCommand); -String ObjectListCommand::GetDescription(void) const +String ObjectListCommand::GetDescription() const { return "Lists all Icinga 2 objects."; } -String ObjectListCommand::GetShortDescription(void) const +String ObjectListCommand::GetShortDescription() const { return "lists all objects"; } diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp index c00aa07fb..36a41f2f3 100644 --- a/lib/cli/objectlistcommand.hpp +++ b/lib/cli/objectlistcommand.hpp @@ -38,8 +38,8 @@ class ObjectListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ObjectListCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; diff --git a/lib/cli/pkinewcacommand.cpp b/lib/cli/pkinewcacommand.cpp index 43037499c..c9c1e172e 100644 --- a/lib/cli/pkinewcacommand.cpp +++ b/lib/cli/pkinewcacommand.cpp @@ -25,12 +25,12 @@ using namespace icinga; REGISTER_CLICOMMAND("pki/new-ca", PKINewCACommand); -String PKINewCACommand::GetDescription(void) const +String PKINewCACommand::GetDescription() const { return "Sets up a new Certificate Authority."; } -String PKINewCACommand::GetShortDescription(void) const +String PKINewCACommand::GetShortDescription() const { return "sets up a new CA"; } diff --git a/lib/cli/pkinewcacommand.hpp b/lib/cli/pkinewcacommand.hpp index 227e00101..515ac98e2 100644 --- a/lib/cli/pkinewcacommand.hpp +++ b/lib/cli/pkinewcacommand.hpp @@ -35,8 +35,8 @@ class PKINewCACommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCACommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkinewcertcommand.cpp b/lib/cli/pkinewcertcommand.cpp index 031e421ff..61215bd0a 100644 --- a/lib/cli/pkinewcertcommand.cpp +++ b/lib/cli/pkinewcertcommand.cpp @@ -26,12 +26,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("pki/new-cert", PKINewCertCommand); -String PKINewCertCommand::GetDescription(void) const +String PKINewCertCommand::GetDescription() const { return "Creates a new Certificate Signing Request, a self-signed X509 certificate or both."; } -String PKINewCertCommand::GetShortDescription(void) const +String PKINewCertCommand::GetShortDescription() const { return "creates a new CSR"; } diff --git a/lib/cli/pkinewcertcommand.hpp b/lib/cli/pkinewcertcommand.hpp index 438e20840..eb64a0ebd 100644 --- a/lib/cli/pkinewcertcommand.hpp +++ b/lib/cli/pkinewcertcommand.hpp @@ -35,8 +35,8 @@ class PKINewCertCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCertCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; diff --git a/lib/cli/pkirequestcommand.cpp b/lib/cli/pkirequestcommand.cpp index 8e5191342..c14fb7b21 100644 --- a/lib/cli/pkirequestcommand.cpp +++ b/lib/cli/pkirequestcommand.cpp @@ -28,12 +28,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("pki/request", PKIRequestCommand); -String PKIRequestCommand::GetDescription(void) const +String PKIRequestCommand::GetDescription() const { return "Sends a PKI request to Icinga 2."; } -String PKIRequestCommand::GetShortDescription(void) const +String PKIRequestCommand::GetShortDescription() const { return "requests a certificate"; } diff --git a/lib/cli/pkirequestcommand.hpp b/lib/cli/pkirequestcommand.hpp index 51a5994d3..2788cb1b7 100644 --- a/lib/cli/pkirequestcommand.hpp +++ b/lib/cli/pkirequestcommand.hpp @@ -35,8 +35,8 @@ class PKIRequestCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKIRequestCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; diff --git a/lib/cli/pkisavecertcommand.cpp b/lib/cli/pkisavecertcommand.cpp index de648fe47..1cfd463e1 100644 --- a/lib/cli/pkisavecertcommand.cpp +++ b/lib/cli/pkisavecertcommand.cpp @@ -29,12 +29,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("pki/save-cert", PKISaveCertCommand); -String PKISaveCertCommand::GetDescription(void) const +String PKISaveCertCommand::GetDescription() const { return "Saves another Icinga 2 instance's certificate."; } -String PKISaveCertCommand::GetShortDescription(void) const +String PKISaveCertCommand::GetShortDescription() const { return "saves another Icinga 2 instance's certificate"; } diff --git a/lib/cli/pkisavecertcommand.hpp b/lib/cli/pkisavecertcommand.hpp index 743368d7a..ceed29201 100644 --- a/lib/cli/pkisavecertcommand.hpp +++ b/lib/cli/pkisavecertcommand.hpp @@ -35,8 +35,8 @@ class PKISaveCertCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISaveCertCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; diff --git a/lib/cli/pkisigncsrcommand.cpp b/lib/cli/pkisigncsrcommand.cpp index ab9ac9ac5..e7de7aca8 100644 --- a/lib/cli/pkisigncsrcommand.cpp +++ b/lib/cli/pkisigncsrcommand.cpp @@ -26,12 +26,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("pki/sign-csr", PKISignCSRCommand); -String PKISignCSRCommand::GetDescription(void) const +String PKISignCSRCommand::GetDescription() const { return "Reads a Certificate Signing Request from stdin and prints a signed certificate on stdout."; } -String PKISignCSRCommand::GetShortDescription(void) const +String PKISignCSRCommand::GetShortDescription() const { return "signs a CSR"; } diff --git a/lib/cli/pkisigncsrcommand.hpp b/lib/cli/pkisigncsrcommand.hpp index 26ed2cd3e..535e16ca7 100644 --- a/lib/cli/pkisigncsrcommand.hpp +++ b/lib/cli/pkisigncsrcommand.hpp @@ -35,8 +35,8 @@ class PKISignCSRCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISignCSRCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; diff --git a/lib/cli/pkiticketcommand.cpp b/lib/cli/pkiticketcommand.cpp index 958efaf6f..8ba088488 100644 --- a/lib/cli/pkiticketcommand.cpp +++ b/lib/cli/pkiticketcommand.cpp @@ -28,12 +28,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("pki/ticket", PKITicketCommand); -String PKITicketCommand::GetDescription(void) const +String PKITicketCommand::GetDescription() const { return "Generates an Icinga 2 ticket"; } -String PKITicketCommand::GetShortDescription(void) const +String PKITicketCommand::GetShortDescription() const { return "generates a ticket"; } diff --git a/lib/cli/pkiticketcommand.hpp b/lib/cli/pkiticketcommand.hpp index 1839889a8..f94230ce5 100644 --- a/lib/cli/pkiticketcommand.hpp +++ b/lib/cli/pkiticketcommand.hpp @@ -35,8 +35,8 @@ class PKITicketCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKITicketCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; diff --git a/lib/cli/troubleshootcommand.cpp b/lib/cli/troubleshootcommand.cpp index 24612af3e..2649058c8 100644 --- a/lib/cli/troubleshootcommand.cpp +++ b/lib/cli/troubleshootcommand.cpp @@ -43,12 +43,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("troubleshoot", TroubleshootCommand); -String TroubleshootCommand::GetDescription(void) const +String TroubleshootCommand::GetDescription() const { return "Collect logs and other relevant information for troubleshooting purposes."; } -String TroubleshootCommand::GetShortDescription(void) const +String TroubleshootCommand::GetShortDescription() const { return "collect information for troubleshooting"; } @@ -75,7 +75,7 @@ public: } } - ~InfoLog(void) + ~InfoLog() { delete m_Stream; } @@ -103,7 +103,7 @@ public: << ConsoleColorTag(Console_Normal, m_ConsoleType); } - bool GetStreamHealth(void) const + bool GetStreamHealth() const { return m_Stream->good(); } @@ -120,7 +120,7 @@ public: InfoLogLine(InfoLog& log, int col = Console_Normal, LogSeverity sev = LogInformation) : m_Log(log), m_Color(col), m_Sev(sev) {} - ~InfoLogLine(void) + ~InfoLogLine() { m_Log.WriteLine(m_Sev, m_Color, m_String.str()); } @@ -442,7 +442,7 @@ bool TroubleshootCommand::PrintFile(InfoLog& log, const String& path) return true; } -bool TroubleshootCommand::CheckConfig(void) +bool TroubleshootCommand::CheckConfig() { return DaemonUtility::ValidateConfigFiles({ Application::GetSysconfDir() + "/icinga2/icinga2.conf" }, Application::GetObjectsPath()); } diff --git a/lib/cli/troubleshootcommand.hpp b/lib/cli/troubleshootcommand.hpp index 7f9e6283d..85ce0c243 100644 --- a/lib/cli/troubleshootcommand.hpp +++ b/lib/cli/troubleshootcommand.hpp @@ -37,8 +37,8 @@ class TroubleshootCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(TroubleshootCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; @@ -59,7 +59,7 @@ private: static void GetLatestReport(const String& filename, time_t& bestTimestamp, String& bestFilename); static bool PrintCrashReports(InfoLog& log); static bool PrintFile(InfoLog& log, const String& path); - static bool CheckConfig(void); + static bool CheckConfig(); static void CheckObjectFile(const String& objectfile, InfoLog& log, InfoLog *OFile, const bool objectConsole, Dictionary::Ptr& logs, std::set& configs); static bool PrintVarsFile(const String& path, const bool console); diff --git a/lib/cli/variablegetcommand.cpp b/lib/cli/variablegetcommand.cpp index 47348814f..76fa634aa 100644 --- a/lib/cli/variablegetcommand.cpp +++ b/lib/cli/variablegetcommand.cpp @@ -41,12 +41,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("variable/get", VariableGetCommand); -String VariableGetCommand::GetDescription(void) const +String VariableGetCommand::GetDescription() const { return "Prints the value of an Icinga 2 variable."; } -String VariableGetCommand::GetShortDescription(void) const +String VariableGetCommand::GetShortDescription() const { return "gets a variable"; } @@ -58,7 +58,7 @@ void VariableGetCommand::InitParameters(boost::program_options::options_descript ("current", "Uses the current value (i.e. from the running process, rather than from the vars file)"); } -int VariableGetCommand::GetMinArguments(void) const +int VariableGetCommand::GetMinArguments() const { return 1; } diff --git a/lib/cli/variablegetcommand.hpp b/lib/cli/variablegetcommand.hpp index 9c59310c2..8f01dc89a 100644 --- a/lib/cli/variablegetcommand.hpp +++ b/lib/cli/variablegetcommand.hpp @@ -38,9 +38,9 @@ class VariableGetCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableGetCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; - virtual int GetMinArguments(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; + virtual int GetMinArguments() const override; void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; diff --git a/lib/cli/variablelistcommand.cpp b/lib/cli/variablelistcommand.cpp index 24df4f767..9aff1cbea 100644 --- a/lib/cli/variablelistcommand.cpp +++ b/lib/cli/variablelistcommand.cpp @@ -36,12 +36,12 @@ namespace po = boost::program_options; REGISTER_CLICOMMAND("variable/list", VariableListCommand); -String VariableListCommand::GetDescription(void) const +String VariableListCommand::GetDescription() const { return "Lists all Icinga 2 variables."; } -String VariableListCommand::GetShortDescription(void) const +String VariableListCommand::GetShortDescription() const { return "lists all variables"; } diff --git a/lib/cli/variablelistcommand.hpp b/lib/cli/variablelistcommand.hpp index 00048bd8e..1e964ff2c 100644 --- a/lib/cli/variablelistcommand.hpp +++ b/lib/cli/variablelistcommand.hpp @@ -38,8 +38,8 @@ class VariableListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableListCommand); - virtual String GetDescription(void) const override; - virtual String GetShortDescription(void) const override; + virtual String GetDescription() const override; + virtual String GetShortDescription() const override; virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: diff --git a/lib/cli/variableutility.hpp b/lib/cli/variableutility.hpp index 4a3ce1545..af1f3fb8e 100644 --- a/lib/cli/variableutility.hpp +++ b/lib/cli/variableutility.hpp @@ -39,7 +39,7 @@ public: static void PrintVariables(std::ostream& outfp); private: - VariableUtility(void); + VariableUtility(); }; diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp index ec2b8d814..40bcbad06 100644 --- a/lib/compat/checkresultreader.cpp +++ b/lib/compat/checkresultreader.cpp @@ -83,7 +83,7 @@ void CheckResultReader::Stop(bool runtimeRemoved) /** * @threadsafety Always. */ -void CheckResultReader::ReadTimerHandler(void) const +void CheckResultReader::ReadTimerHandler() const { CONTEXT("Processing check result files in '" + GetSpoolDir() + "'"); diff --git a/lib/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp index ba2a741ca..691efd235 100644 --- a/lib/compat/checkresultreader.hpp +++ b/lib/compat/checkresultreader.hpp @@ -46,7 +46,7 @@ protected: private: Timer::Ptr m_ReadTimer; - void ReadTimerHandler(void) const; + void ReadTimerHandler() const; void ProcessCheckResultFile(const String& path) const; }; diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp index f8e0dcb04..ddcbf1f86 100644 --- a/lib/compat/compatlogger.cpp +++ b/lib/compat/compatlogger.cpp @@ -445,7 +445,7 @@ void CompatLogger::WriteLine(const String& line) m_OutputFile << "[" << (long)Utility::GetTime() << "] " << line << "\n"; } -void CompatLogger::Flush(void) +void CompatLogger::Flush() { ASSERT(OwnsLock()); @@ -531,7 +531,7 @@ void CompatLogger::ReopenFile(bool rotate) Flush(); } -void CompatLogger::ScheduleNextRotation(void) +void CompatLogger::ScheduleNextRotation() { time_t now = (time_t)Utility::GetTime(); String method = GetRotationMethod(); @@ -585,7 +585,7 @@ void CompatLogger::ScheduleNextRotation(void) /** * @threadsafety Always. */ -void CompatLogger::RotationTimerHandler(void) +void CompatLogger::RotationTimerHandler() { try { ReopenFile(true); diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp index c1edeef30..14052f810 100644 --- a/lib/compat/compatlogger.hpp +++ b/lib/compat/compatlogger.hpp @@ -49,7 +49,7 @@ protected: private: void WriteLine(const String& line); - void Flush(void); + void Flush(); void CheckResultHandler(const Checkable::Ptr& service, const CheckResult::Ptr& cr); void NotificationSentHandler(const Notification::Ptr& notification, const Checkable::Ptr& service, @@ -63,8 +63,8 @@ private: void EventCommandHandler(const Checkable::Ptr& service); Timer::Ptr m_RotationTimer; - void RotationTimerHandler(void); - void ScheduleNextRotation(void); + void RotationTimerHandler(); + void ScheduleNextRotation(); std::ofstream m_OutputFile; void ReopenFile(bool rotate); diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp index ab9f4d0df..d1f39811d 100644 --- a/lib/compat/statusdatawriter.cpp +++ b/lib/compat/statusdatawriter.cpp @@ -538,7 +538,7 @@ void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const CustomVarObj fp << "\t" "_is_json" "\t" "1" "\n"; } -void StatusDataWriter::UpdateObjectsCache(void) +void StatusDataWriter::UpdateObjectsCache() { CONTEXT("Writing objects.cache file"); @@ -777,7 +777,7 @@ void StatusDataWriter::UpdateObjectsCache(void) /** * Periodically writes the status.dat and objects.cache files. */ -void StatusDataWriter::StatusTimerHandler(void) +void StatusDataWriter::StatusTimerHandler() { if (m_ObjectsCacheOutdated) { UpdateObjectsCache(); @@ -859,7 +859,7 @@ void StatusDataWriter::StatusTimerHandler(void) << "Writing status.dat file took " << Utility::FormatDuration(Utility::GetTime() - start); } -void StatusDataWriter::ObjectHandler(void) +void StatusDataWriter::ObjectHandler() { m_ObjectsCacheOutdated = true; } diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp index 26a53eb5e..0b04bcefd 100644 --- a/lib/compat/statusdatawriter.hpp +++ b/lib/compat/statusdatawriter.hpp @@ -94,9 +94,9 @@ private: void DumpCustomAttributes(std::ostream& fp, const CustomVarObject::Ptr& object); - void UpdateObjectsCache(void); - void StatusTimerHandler(void); - void ObjectHandler(void); + void UpdateObjectsCache(); + void StatusTimerHandler(); + void ObjectHandler(); }; } diff --git a/lib/config/activationcontext.cpp b/lib/config/activationcontext.cpp index ac9eab925..843dec092 100644 --- a/lib/config/activationcontext.cpp +++ b/lib/config/activationcontext.cpp @@ -24,7 +24,7 @@ using namespace icinga; boost::thread_specific_ptr > ActivationContext::m_ActivationStack; -std::stack& ActivationContext::GetActivationStack(void) +std::stack& ActivationContext::GetActivationStack() { std::stack *actx = m_ActivationStack.get(); @@ -41,13 +41,13 @@ void ActivationContext::PushContext(const ActivationContext::Ptr& context) GetActivationStack().push(context); } -void ActivationContext::PopContext(void) +void ActivationContext::PopContext() { ASSERT(!GetActivationStack().empty()); GetActivationStack().pop(); } -ActivationContext::Ptr ActivationContext::GetCurrentContext(void) +ActivationContext::Ptr ActivationContext::GetCurrentContext() { std::stack& astack = GetActivationStack(); @@ -66,12 +66,12 @@ ActivationScope::ActivationScope(const ActivationContext::Ptr& context) ActivationContext::PushContext(m_Context); } -ActivationScope::~ActivationScope(void) +ActivationScope::~ActivationScope() { ActivationContext::PopContext(); } -ActivationContext::Ptr ActivationScope::GetContext(void) const +ActivationContext::Ptr ActivationScope::GetContext() const { return m_Context; } diff --git a/lib/config/activationcontext.hpp b/lib/config/activationcontext.hpp index 5f773e409..4040a8d3d 100644 --- a/lib/config/activationcontext.hpp +++ b/lib/config/activationcontext.hpp @@ -33,13 +33,13 @@ class ActivationContext final : public Object public: DECLARE_PTR_TYPEDEFS(ActivationContext); - static ActivationContext::Ptr GetCurrentContext(void); + static ActivationContext::Ptr GetCurrentContext(); private: static void PushContext(const ActivationContext::Ptr& context); - static void PopContext(void); + static void PopContext(); - static std::stack& GetActivationStack(void); + static std::stack& GetActivationStack(); static boost::thread_specific_ptr > m_ActivationStack; @@ -50,9 +50,9 @@ class ActivationScope { public: ActivationScope(const ActivationContext::Ptr& context = nullptr); - ~ActivationScope(void); + ~ActivationScope(); - ActivationContext::Ptr GetContext(void) const; + ActivationContext::Ptr GetContext() const; private: ActivationContext::Ptr m_Context; diff --git a/lib/config/applyrule.cpp b/lib/config/applyrule.cpp index 813c6b591..4ad291330 100644 --- a/lib/config/applyrule.cpp +++ b/lib/config/applyrule.cpp @@ -33,57 +33,57 @@ ApplyRule::ApplyRule(const String& targetType, const String& name, const std::sh m_FVVar(fvvar), m_FTerm(fterm), m_IgnoreOnError(ignoreOnError), m_DebugInfo(di), m_Scope(scope), m_HasMatches(false) { } -String ApplyRule::GetTargetType(void) const +String ApplyRule::GetTargetType() const { return m_TargetType; } -String ApplyRule::GetName(void) const +String ApplyRule::GetName() const { return m_Name; } -std::shared_ptr ApplyRule::GetExpression(void) const +std::shared_ptr ApplyRule::GetExpression() const { return m_Expression; } -std::shared_ptr ApplyRule::GetFilter(void) const +std::shared_ptr ApplyRule::GetFilter() const { return m_Filter; } -String ApplyRule::GetPackage(void) const +String ApplyRule::GetPackage() const { return m_Package; } -String ApplyRule::GetFKVar(void) const +String ApplyRule::GetFKVar() const { return m_FKVar; } -String ApplyRule::GetFVVar(void) const +String ApplyRule::GetFVVar() const { return m_FVVar; } -std::shared_ptr ApplyRule::GetFTerm(void) const +std::shared_ptr ApplyRule::GetFTerm() const { return m_FTerm; } -bool ApplyRule::GetIgnoreOnError(void) const +bool ApplyRule::GetIgnoreOnError() const { return m_IgnoreOnError; } -DebugInfo ApplyRule::GetDebugInfo(void) const +DebugInfo ApplyRule::GetDebugInfo() const { return m_DebugInfo; } -Dictionary::Ptr ApplyRule::GetScope(void) const +Dictionary::Ptr ApplyRule::GetScope() const { return m_Scope; } @@ -138,12 +138,12 @@ std::vector ApplyRule::GetTargetTypes(const String& sourceType) return it->second; } -void ApplyRule::AddMatch(void) +void ApplyRule::AddMatch() { m_HasMatches = true; } -bool ApplyRule::HasMatches(void) const +bool ApplyRule::HasMatches() const { return m_HasMatches; } @@ -158,7 +158,7 @@ std::vector& ApplyRule::GetRules(const String& type) return it->second; } -void ApplyRule::CheckMatches(void) +void ApplyRule::CheckMatches() { for (const RuleMap::value_type& kv : m_Rules) { for (const ApplyRule& rule : kv.second) { diff --git a/lib/config/applyrule.hpp b/lib/config/applyrule.hpp index 8a13db392..1d06598c7 100644 --- a/lib/config/applyrule.hpp +++ b/lib/config/applyrule.hpp @@ -36,19 +36,19 @@ public: typedef std::map > TypeMap; typedef std::map > RuleMap; - String GetTargetType(void) const; - String GetName(void) const; - std::shared_ptr GetExpression(void) const; - std::shared_ptr GetFilter(void) const; - String GetPackage(void) const; - String GetFKVar(void) const; - String GetFVVar(void) const; - std::shared_ptr GetFTerm(void) const; - bool GetIgnoreOnError(void) const; - DebugInfo GetDebugInfo(void) const; - Dictionary::Ptr GetScope(void) const; - void AddMatch(void); - bool HasMatches(void) const; + String GetTargetType() const; + String GetName() const; + std::shared_ptr GetExpression() const; + std::shared_ptr GetFilter() const; + String GetPackage() const; + String GetFKVar() const; + String GetFVVar() const; + std::shared_ptr GetFTerm() const; + bool GetIgnoreOnError() const; + DebugInfo GetDebugInfo() const; + Dictionary::Ptr GetScope() const; + void AddMatch(); + bool HasMatches() const; bool EvaluateFilter(ScriptFrame& frame) const; @@ -62,7 +62,7 @@ public: static bool IsValidTargetType(const String& sourceType, const String& targetType); static std::vector GetTargetTypes(const String& sourceType); - static void CheckMatches(void); + static void CheckMatches(); private: String m_TargetType; diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll index 2a893ccac..6a2d84027 100644 --- a/lib/config/config_lexer.ll +++ b/lib/config/config_lexer.ll @@ -254,13 +254,13 @@ in return T_IN; %% -void ConfigCompiler::InitializeScanner(void) +void ConfigCompiler::InitializeScanner() { yylex_init(&m_Scanner); yyset_extra(this, m_Scanner); } -void ConfigCompiler::DestroyScanner(void) +void ConfigCompiler::DestroyScanner() { yylex_destroy(m_Scanner); } diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy index 540d39ad4..6e41b2864 100644 --- a/lib/config/config_parser.yy +++ b/lib/config/config_parser.yy @@ -267,7 +267,7 @@ static void UseFlowControl(ConfigCompiler *compiler, FlowControlType type, const BOOST_THROW_EXCEPTION(ScriptError("Invalid flow control statement.", location)); } -std::unique_ptr ConfigCompiler::Compile(void) +std::unique_ptr ConfigCompiler::Compile() { std::vector, EItemInfo> > llist; diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp index 67f988eab..02730bc32 100644 --- a/lib/config/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -51,7 +51,7 @@ ConfigCompiler::ConfigCompiler(const String& path, std::istream *input, /** * Destructor for the ConfigCompiler class. */ -ConfigCompiler::~ConfigCompiler(void) +ConfigCompiler::~ConfigCompiler() { DestroyScanner(); } @@ -74,7 +74,7 @@ size_t ConfigCompiler::ReadInput(char *buffer, size_t max_size) * * @returns The scanner object. */ -void *ConfigCompiler::GetScanner(void) const +void *ConfigCompiler::GetScanner() const { return m_Scanner; } @@ -84,7 +84,7 @@ void *ConfigCompiler::GetScanner(void) const * * @returns The path. */ -const char *ConfigCompiler::GetPath(void) const +const char *ConfigCompiler::GetPath() const { return m_Path.CStr(); } @@ -94,7 +94,7 @@ void ConfigCompiler::SetZone(const String& zone) m_Zone = zone; } -String ConfigCompiler::GetZone(void) const +String ConfigCompiler::GetZone() const { return m_Zone; } @@ -104,7 +104,7 @@ void ConfigCompiler::SetPackage(const String& package) m_Package = package; } -String ConfigCompiler::GetPackage(void) const +String ConfigCompiler::GetPackage() const { return m_Package; } diff --git a/lib/config/configcompiler.hpp b/lib/config/configcompiler.hpp index 53df8994a..3b7b1ae97 100644 --- a/lib/config/configcompiler.hpp +++ b/lib/config/configcompiler.hpp @@ -46,7 +46,7 @@ struct CompilerDebugInfo int LastLine; int LastColumn; - operator DebugInfo(void) const + operator DebugInfo() const { DebugInfo di; di.Path = Path; @@ -88,9 +88,9 @@ class ConfigCompiler public: explicit ConfigCompiler(const String& path, std::istream *input, const String& zone = String(), const String& package = String()); - virtual ~ConfigCompiler(void); + virtual ~ConfigCompiler(); - std::unique_ptr Compile(void); + std::unique_ptr Compile(); static std::unique_ptrCompileStream(const String& path, std::istream *stream, const String& zone = String(), const String& package = String()); @@ -101,13 +101,13 @@ public: static void AddIncludeSearchDir(const String& dir); - const char *GetPath(void) const; + const char *GetPath() const; void SetZone(const String& zone); - String GetZone(void) const; + String GetZone() const; void SetPackage(const String& package); - String GetPackage(void) const; + String GetPackage() const; static void CollectIncludes(std::vector >& expressions, const String& file, const String& zone, const String& package); @@ -120,7 +120,7 @@ public: const String& path, const String& pattern, const String& package, const DebugInfo& debuginfo = DebugInfo()); size_t ReadInput(char *buffer, size_t max_bytes); - void *GetScanner(void) const; + void *GetScanner() const; static std::vector GetZoneDirs(const String& zone); static void RegisterZoneDir(const String& tag, const String& ppath, const String& zoneName); @@ -141,8 +141,8 @@ private: static boost::mutex m_ZoneDirsMutex; static std::map > m_ZoneDirs; - void InitializeScanner(void); - void DestroyScanner(void); + void InitializeScanner(); + void DestroyScanner(); static void HandleIncludeZone(const String& relativeBase, const String& tag, const String& path, const String& pattern, const String& package, std::vector >& expressions); diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp index 8f538a9b9..011ae68a2 100644 --- a/lib/config/configcompilercontext.cpp +++ b/lib/config/configcompilercontext.cpp @@ -26,12 +26,12 @@ using namespace icinga; -ConfigCompilerContext *ConfigCompilerContext::GetInstance(void) +ConfigCompilerContext *ConfigCompilerContext::GetInstance() { return Singleton::GetInstance(); } -ConfigCompilerContext::ConfigCompilerContext(void) +ConfigCompilerContext::ConfigCompilerContext() : m_ObjectsFP(nullptr) { } @@ -66,7 +66,7 @@ void ConfigCompilerContext::WriteObject(const Dictionary::Ptr& object) } } -void ConfigCompilerContext::CancelObjectsFile(void) +void ConfigCompilerContext::CancelObjectsFile() { delete m_ObjectsFP; m_ObjectsFP = nullptr; @@ -78,7 +78,7 @@ void ConfigCompilerContext::CancelObjectsFile(void) #endif /* _WIN32 */ } -void ConfigCompilerContext::FinishObjectsFile(void) +void ConfigCompilerContext::FinishObjectsFile() { delete m_ObjectsFP; m_ObjectsFP = nullptr; diff --git a/lib/config/configcompilercontext.hpp b/lib/config/configcompilercontext.hpp index 75fa887e7..e0e49dc98 100644 --- a/lib/config/configcompilercontext.hpp +++ b/lib/config/configcompilercontext.hpp @@ -34,14 +34,14 @@ namespace icinga class ConfigCompilerContext { public: - ConfigCompilerContext(void); + ConfigCompilerContext(); void OpenObjectsFile(const String& filename); void WriteObject(const Dictionary::Ptr& object); - void CancelObjectsFile(void); - void FinishObjectsFile(void); + void CancelObjectsFile(); + void FinishObjectsFile(); - static ConfigCompilerContext *GetInstance(void); + static ConfigCompilerContext *GetInstance(); private: String m_ObjectsPath; diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 9d657c4ca..8e10ef12c 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -77,7 +77,7 @@ ConfigItem::ConfigItem(const Type::Ptr& type, const String& name, * * @returns The type. */ -Type::Ptr ConfigItem::GetType(void) const +Type::Ptr ConfigItem::GetType() const { return m_Type; } @@ -87,7 +87,7 @@ Type::Ptr ConfigItem::GetType(void) const * * @returns The name. */ -String ConfigItem::GetName(void) const +String ConfigItem::GetName() const { return m_Name; } @@ -97,17 +97,17 @@ String ConfigItem::GetName(void) const * * @returns true if the item is abstract, false otherwise. */ -bool ConfigItem::IsAbstract(void) const +bool ConfigItem::IsAbstract() const { return m_Abstract; } -bool ConfigItem::IsDefaultTemplate(void) const +bool ConfigItem::IsDefaultTemplate() const { return m_DefaultTmpl; } -bool ConfigItem::IsIgnoreOnError(void) const +bool ConfigItem::IsIgnoreOnError() const { return m_IgnoreOnError; } @@ -117,17 +117,17 @@ bool ConfigItem::IsIgnoreOnError(void) const * * @returns The debug information. */ -DebugInfo ConfigItem::GetDebugInfo(void) const +DebugInfo ConfigItem::GetDebugInfo() const { return m_DebugInfo; } -Dictionary::Ptr ConfigItem::GetScope(void) const +Dictionary::Ptr ConfigItem::GetScope() const { return m_Scope; } -ConfigObject::Ptr ConfigItem::GetObject(void) const +ConfigObject::Ptr ConfigItem::GetObject() const { return m_Object; } @@ -137,7 +137,7 @@ ConfigObject::Ptr ConfigItem::GetObject(void) const * * @returns The expression list. */ -std::shared_ptr ConfigItem::GetExpression(void) const +std::shared_ptr ConfigItem::GetExpression() const { return m_Expression; } @@ -147,7 +147,7 @@ std::shared_ptr ConfigItem::GetExpression(void) const * * @returns The filter expression. */ -std::shared_ptr ConfigItem::GetFilter(void) const +std::shared_ptr ConfigItem::GetFilter() const { return m_Filter; } @@ -318,7 +318,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard) /** * Registers the configuration item. */ -void ConfigItem::Register(void) +void ConfigItem::Register() { m_ActivationContext = ActivationContext::GetCurrentContext(); @@ -351,7 +351,7 @@ void ConfigItem::Register(void) /** * Unregisters the configuration item. */ -void ConfigItem::Unregister(void) +void ConfigItem::Unregister() { if (m_Object) { m_Object->Unregister(); diff --git a/lib/config/configitem.hpp b/lib/config/configitem.hpp index 29b332f92..30d28c572 100644 --- a/lib/config/configitem.hpp +++ b/lib/config/configitem.hpp @@ -47,24 +47,24 @@ public: const Dictionary::Ptr& scope, const String& zone, const String& package); - Type::Ptr GetType(void) const; - String GetName(void) const; - bool IsAbstract(void) const; - bool IsDefaultTemplate(void) const; - bool IsIgnoreOnError(void) const; + Type::Ptr GetType() const; + String GetName() const; + bool IsAbstract() const; + bool IsDefaultTemplate() const; + bool IsIgnoreOnError() const; - std::vector GetParents(void) const; + std::vector GetParents() const; - std::shared_ptr GetExpression(void) const; - std::shared_ptr GetFilter(void) const; + std::shared_ptr GetExpression() const; + std::shared_ptr GetFilter() const; - void Register(void); - void Unregister(void); + void Register(); + void Unregister(); - DebugInfo GetDebugInfo(void) const; - Dictionary::Ptr GetScope(void) const; + DebugInfo GetDebugInfo() const; + Dictionary::Ptr GetScope() const; - ConfigObject::Ptr GetObject(void) const; + ConfigObject::Ptr GetObject() const; static ConfigItem::Ptr GetByTypeAndName(const Type::Ptr& type, const String& name); diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp index 6365b44f1..6d120a3ce 100644 --- a/lib/config/configitembuilder.cpp +++ b/lib/config/configitembuilder.cpp @@ -23,7 +23,7 @@ using namespace icinga; -ConfigItemBuilder::ConfigItemBuilder(void) +ConfigItemBuilder::ConfigItemBuilder() : m_Abstract(false), m_DefaultTmpl(false), m_IgnoreOnError(false) { m_DebugInfo.FirstLine = 0; @@ -88,7 +88,7 @@ void ConfigItemBuilder::SetIgnoreOnError(bool ignoreOnError) m_IgnoreOnError = ignoreOnError; } -ConfigItem::Ptr ConfigItemBuilder::Compile(void) +ConfigItem::Ptr ConfigItemBuilder::Compile() { if (!m_Type) { std::ostringstream msgbuf; diff --git a/lib/config/configitembuilder.hpp b/lib/config/configitembuilder.hpp index 1e400a5a5..250d28853 100644 --- a/lib/config/configitembuilder.hpp +++ b/lib/config/configitembuilder.hpp @@ -39,7 +39,7 @@ class ConfigItemBuilder final : public Object public: DECLARE_PTR_TYPEDEFS(ConfigItemBuilder); - ConfigItemBuilder(void); + ConfigItemBuilder(); explicit ConfigItemBuilder(const DebugInfo& debugInfo); void SetType(const Type::Ptr& type); @@ -54,7 +54,7 @@ public: void AddExpression(Expression *expr); void SetFilter(const std::shared_ptr& filter); - ConfigItem::Ptr Compile(void); + ConfigItem::Ptr Compile(); private: Type::Ptr m_Type; /**< The object type. */ diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp index 7b872895c..9692655a2 100644 --- a/lib/config/expression.cpp +++ b/lib/config/expression.cpp @@ -36,7 +36,7 @@ using namespace icinga; boost::signals2::signal Expression::OnBreakpoint; boost::thread_specific_ptr l_InBreakpointHandler; -Expression::~Expression(void) +Expression::~Expression() { } void Expression::ScriptBreakpoint(ScriptFrame& frame, ScriptError *ex, const DebugInfo& di) @@ -84,7 +84,7 @@ bool Expression::GetReference(ScriptFrame& frame, bool init_dict, Value *parent, return false; } -const DebugInfo& Expression::GetDebugInfo(void) const +const DebugInfo& Expression::GetDebugInfo() const { static DebugInfo debugInfo; return debugInfo; @@ -96,7 +96,7 @@ std::unique_ptr icinga::MakeIndexer(ScopeSpecifier scopeSpec, const return std::unique_ptr(new IndexerExpression(std::move(scope), MakeLiteral(index))); } -void DictExpression::MakeInline(void) +void DictExpression::MakeInline() { m_Inline = true; } @@ -110,7 +110,7 @@ ExpressionResult LiteralExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dh return m_Value; } -const DebugInfo& DebuggableExpression::GetDebugInfo(void) const +const DebugInfo& DebuggableExpression::GetDebugInfo() const { return m_DebugInfo; } diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index d9c3e841b..3faa8f1b4 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -65,7 +65,7 @@ public: return DebugHint(child); } - Dictionary::Ptr ToDictionary(void) const + Dictionary::Ptr ToDictionary() const { return m_Hints; } @@ -75,7 +75,7 @@ private: Array::Ptr m_Messages; Dictionary::Ptr m_Children; - const Array::Ptr& GetMessages(void) + const Array::Ptr& GetMessages() { if (m_Messages) return m_Messages; @@ -94,7 +94,7 @@ private: return m_Messages; } - const Dictionary::Ptr& GetChildren(void) + const Dictionary::Ptr& GetChildren() { if (m_Children) return m_Children; @@ -158,17 +158,17 @@ public: : m_Value(value), m_Code(code) { } - operator const Value&(void) const + operator const Value&() const { return m_Value; } - const Value& GetValue(void) const + const Value& GetValue() const { return m_Value; } - ExpressionResultCode GetCode(void) const + ExpressionResultCode GetCode() const { return m_Code; } @@ -198,15 +198,15 @@ private: class Expression { public: - Expression(void) = default; + Expression() = default; Expression(const Expression&) = delete; - virtual ~Expression(void); + virtual ~Expression(); Expression& operator=(const Expression&) = delete; ExpressionResult Evaluate(ScriptFrame& frame, DebugHint *dhint = nullptr) const; virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint = nullptr) const; - virtual const DebugInfo& GetDebugInfo(void) const; + virtual const DebugInfo& GetDebugInfo() const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const = 0; @@ -230,7 +230,7 @@ protected: return m_Expression->DoEvaluate(frame, dhint); } - virtual const DebugInfo& GetDebugInfo(void) const override + virtual const DebugInfo& GetDebugInfo() const override { return m_Expression->GetDebugInfo(); } @@ -244,7 +244,7 @@ class LiteralExpression final : public Expression public: LiteralExpression(const Value& value = Value()); - const Value& GetValue(void) const + const Value& GetValue() const { return m_Value; } @@ -274,7 +274,7 @@ public: { } protected: - virtual const DebugInfo& GetDebugInfo(void) const override final; + const DebugInfo& GetDebugInfo(void) const final; DebugInfo m_DebugInfo; }; @@ -309,7 +309,7 @@ public: : DebuggableExpression(debugInfo), m_Variable(variable) { } - String GetVariable(void) const + String GetVariable() const { return m_Variable; } @@ -602,7 +602,7 @@ public: : DebuggableExpression(debugInfo), m_Expressions(std::move(expressions)), m_Inline(false) { } - void MakeInline(void); + void MakeInline(); protected: virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; diff --git a/lib/config/objectrule.hpp b/lib/config/objectrule.hpp index 1d080cebe..1e20f346c 100644 --- a/lib/config/objectrule.hpp +++ b/lib/config/objectrule.hpp @@ -40,7 +40,7 @@ public: static bool IsValidSourceType(const String& sourceType); private: - ObjectRule(void); + ObjectRule(); static TypeSet m_Types; }; diff --git a/lib/db_ido/commanddbobject.cpp b/lib/db_ido/commanddbobject.cpp index 5803f5d8a..b770a0b62 100644 --- a/lib/db_ido/commanddbobject.cpp +++ b/lib/db_ido/commanddbobject.cpp @@ -33,7 +33,7 @@ CommandDbObject::CommandDbObject(const DbType::Ptr& type, const String& name1, c : DbObject(type, name1, name2) { } -Dictionary::Ptr CommandDbObject::GetConfigFields(void) const +Dictionary::Ptr CommandDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); Command::Ptr command = static_pointer_cast(GetObject()); @@ -43,7 +43,7 @@ Dictionary::Ptr CommandDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr CommandDbObject::GetStatusFields(void) const +Dictionary::Ptr CommandDbObject::GetStatusFields() const { return nullptr; } diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp index 862f26a77..58d742688 100644 --- a/lib/db_ido/commanddbobject.hpp +++ b/lib/db_ido/commanddbobject.hpp @@ -38,8 +38,8 @@ public: CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index 849231075..fd1581f16 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -37,11 +37,11 @@ REGISTER_TYPE(DbConnection); Timer::Ptr DbConnection::m_ProgramStatusTimer; boost::once_flag DbConnection::m_OnceFlag = BOOST_ONCE_INIT; -DbConnection::DbConnection(void) +DbConnection::DbConnection() : m_IDCacheValid(false), m_QueryStats(15 * 60), m_ActiveChangedHandler(false) { } -void DbConnection::OnConfigLoaded(void) +void DbConnection::OnConfigLoaded() { ConfigObject::OnConfigLoaded(); @@ -78,7 +78,7 @@ void DbConnection::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -void DbConnection::EnableActiveChangedHandler(void) +void DbConnection::EnableActiveChangedHandler() { if (!m_ActiveChangedHandler) { ConfigObject::OnActiveChanged.connect(std::bind(&DbConnection::UpdateObject, this, _1)); @@ -86,7 +86,7 @@ void DbConnection::EnableActiveChangedHandler(void) } } -void DbConnection::Resume(void) +void DbConnection::Resume() { ConfigObject::Resume(); @@ -99,7 +99,7 @@ void DbConnection::Resume(void) m_CleanUpTimer->Start(); } -void DbConnection::Pause(void) +void DbConnection::Pause() { ConfigObject::Pause(); @@ -127,7 +127,7 @@ void DbConnection::Pause(void) NewTransaction(); } -void DbConnection::InitializeDbTimer(void) +void DbConnection::InitializeDbTimer() { m_ProgramStatusTimer = new Timer(); m_ProgramStatusTimer->SetInterval(10); @@ -148,7 +148,7 @@ void DbConnection::InsertRuntimeVariable(const String& key, const Value& value) DbObject::OnQuery(query); } -void DbConnection::UpdateProgramStatus(void) +void DbConnection::UpdateProgramStatus() { Log(LogNotice, "DbConnection") << "Updating programstatus table."; @@ -204,7 +204,7 @@ void DbConnection::UpdateProgramStatus(void) InsertRuntimeVariable("total_scheduled_hosts", ConfigType::Get()->GetObjectCount()); } -void DbConnection::CleanUpHandler(void) +void DbConnection::CleanUpHandler() { long now = static_cast(Utility::GetTime()); @@ -348,7 +348,7 @@ bool DbConnection::GetObjectActive(const DbObject::Ptr& dbobj) const return (m_ActiveObjects.find(dbobj) != m_ActiveObjects.end()); } -void DbConnection::ClearIDCache(void) +void DbConnection::ClearIDCache() { SetIDCacheValid(false); @@ -423,7 +423,7 @@ void DbConnection::UpdateObject(const ConfigObject::Ptr& object) } } -void DbConnection::UpdateAllObjects(void) +void DbConnection::UpdateAllObjects() { for (const Type::Ptr& type : Type::GetAllTypes()) { ConfigType *dtype = dynamic_cast(type.get()); @@ -437,7 +437,7 @@ void DbConnection::UpdateAllObjects(void) } } -void DbConnection::PrepareDatabase(void) +void DbConnection::PrepareDatabase() { for (const DbType::Ptr& type : DbType::GetAllTypes()) { FillIDCache(type); @@ -465,7 +465,7 @@ void DbConnection::ValidateCategories(const Array::Ptr& value, const ValidationU BOOST_THROW_EXCEPTION(ValidationError(this, { "categories" }, "categories filter is invalid.")); } -void DbConnection::IncreaseQueryCount(void) +void DbConnection::IncreaseQueryCount() { double now = Utility::GetTime(); @@ -479,7 +479,7 @@ int DbConnection::GetQueryCount(RingBuffer::SizeType span) return m_QueryStats.UpdateAndGetValues(Utility::GetTime(), span); } -bool DbConnection::IsIDCacheValid(void) const +bool DbConnection::IsIDCacheValid() const { return m_IDCacheValid; } @@ -489,7 +489,7 @@ void DbConnection::SetIDCacheValid(bool valid) m_IDCacheValid = valid; } -int DbConnection::GetSessionToken(void) +int DbConnection::GetSessionToken() { return Application::GetStartTime(); } diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp index eab1170aa..0175f29e8 100644 --- a/lib/db_ido/dbconnection.hpp +++ b/lib/db_ido/dbconnection.hpp @@ -45,9 +45,9 @@ class DbConnection : public ObjectImpl public: DECLARE_OBJECT(DbConnection); - DbConnection(void); + DbConnection(); - static void InitializeDbTimer(void); + static void InitializeDbTimer(); void SetConfigHash(const DbObject::Ptr& dbobj, const String& hash); void SetConfigHash(const DbType::Ptr& type, const DbReference& objid, const String& hash); @@ -65,7 +65,7 @@ public: void SetObjectActive(const DbObject::Ptr& dbobj, bool active); bool GetObjectActive(const DbObject::Ptr& dbobj) const; - void ClearIDCache(void); + void ClearIDCache(); void SetConfigUpdate(const DbObject::Ptr& dbobj, bool hasupdate); bool GetConfigUpdate(const DbObject::Ptr& dbobj) const; @@ -74,17 +74,17 @@ public: bool GetStatusUpdate(const DbObject::Ptr& dbobj) const; int GetQueryCount(RingBuffer::SizeType span); - virtual int GetPendingQueryCount(void) const = 0; + virtual int GetPendingQueryCount() const = 0; virtual void ValidateFailoverTimeout(double value, const ValidationUtils& utils) override final; virtual void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) override final; protected: - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; - virtual void Resume(void) override; - virtual void Pause(void) override; + virtual void Resume() override; + virtual void Pause() override; virtual void ExecuteQuery(const DbQuery& query) = 0; virtual void ExecuteMultipleQueries(const std::vector&) = 0; @@ -93,23 +93,23 @@ protected: virtual void CleanUpExecuteQuery(const String& table, const String& time_column, double max_age); virtual void FillIDCache(const DbType::Ptr& type) = 0; - virtual void NewTransaction(void) = 0; + virtual void NewTransaction() = 0; void UpdateObject(const ConfigObject::Ptr& object); - void UpdateAllObjects(void); + void UpdateAllObjects(); - void PrepareDatabase(void); + void PrepareDatabase(); - void IncreaseQueryCount(void); + void IncreaseQueryCount(); - bool IsIDCacheValid(void) const; + bool IsIDCacheValid() const; void SetIDCacheValid(bool valid); - void EnableActiveChangedHandler(void); + void EnableActiveChangedHandler(); - static void UpdateProgramStatus(void); + static void UpdateProgramStatus(); - static int GetSessionToken(void); + static int GetSessionToken(); private: bool m_IDCacheValid; @@ -121,7 +121,7 @@ private: std::set m_StatusUpdates; Timer::Ptr m_CleanUpTimer; - void CleanUpHandler(void); + void CleanUpHandler(); static Timer::Ptr m_ProgramStatusTimer; static boost::once_flag m_OnceFlag; diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp index 4a3d8a00a..abe1ddfed 100644 --- a/lib/db_ido/dbevents.cpp +++ b/lib/db_ido/dbevents.cpp @@ -39,7 +39,7 @@ using namespace icinga; INITIALIZE_ONCE(&DbEvents::StaticInitialize); -void DbEvents::StaticInitialize(void) +void DbEvents::StaticInitialize() { /* Status */ Comment::OnCommentAdded.connect(std::bind(&DbEvents::AddComment, _1)); diff --git a/lib/db_ido/dbevents.hpp b/lib/db_ido/dbevents.hpp index 09f97aa51..b651dd600 100644 --- a/lib/db_ido/dbevents.hpp +++ b/lib/db_ido/dbevents.hpp @@ -59,7 +59,7 @@ enum LogEntryType class DbEvents { public: - static void StaticInitialize(void); + static void StaticInitialize(); static void AddComments(const Checkable::Ptr& checkable); @@ -125,7 +125,7 @@ public: static void AddExternalCommandHistory(double time, const String& command, const std::vector& arguments); private: - DbEvents(void); + DbEvents(); static void AddCommentInternal(std::vector& queries, const Comment::Ptr& comment, bool historical); static void RemoveCommentInternal(std::vector& queries, const Comment::Ptr& comment); diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp index 376efd212..d781756c4 100644 --- a/lib/db_ido/dbobject.cpp +++ b/lib/db_ido/dbobject.cpp @@ -49,7 +49,7 @@ DbObject::DbObject(const intrusive_ptr& type, const String& name1, const : m_Name1(name1), m_Name2(name2), m_Type(type), m_LastConfigUpdate(0), m_LastStatusUpdate(0) { } -void DbObject::StaticInitialize(void) +void DbObject::StaticInitialize() { /* triggered in ProcessCheckResult(), requires UpdateNextCheck() to be called before */ ConfigObject::OnStateChanged.connect(std::bind(&DbObject::StateChangedHandler, _1)); @@ -64,22 +64,22 @@ void DbObject::SetObject(const ConfigObject::Ptr& object) m_Object = object; } -ConfigObject::Ptr DbObject::GetObject(void) const +ConfigObject::Ptr DbObject::GetObject() const { return m_Object; } -String DbObject::GetName1(void) const +String DbObject::GetName1() const { return m_Name1; } -String DbObject::GetName2(void) const +String DbObject::GetName2() const { return m_Name2; } -DbType::Ptr DbObject::GetType(void) const +DbType::Ptr DbObject::GetType() const { return m_Type; } @@ -157,12 +157,12 @@ void DbObject::SendConfigUpdateHeavy(const Dictionary::Ptr& configFields) OnConfigUpdateHeavy(); } -void DbObject::SendConfigUpdateLight(void) +void DbObject::SendConfigUpdateLight() { OnConfigUpdateLight(); } -void DbObject::SendStatusUpdate(void) +void DbObject::SendStatusUpdate() { /* status attributes */ Dictionary::Ptr fields = GetStatusFields(); @@ -200,7 +200,7 @@ void DbObject::SendStatusUpdate(void) OnStatusUpdate(); } -void DbObject::SendVarsConfigUpdateHeavy(void) +void DbObject::SendVarsConfigUpdateHeavy() { ConfigObject::Ptr obj = GetObject(); @@ -265,7 +265,7 @@ void DbObject::SendVarsConfigUpdateHeavy(void) OnMultipleQueries(queries); } -void DbObject::SendVarsStatusUpdate(void) +void DbObject::SendVarsStatusUpdate() { ConfigObject::Ptr obj = GetObject(); @@ -317,27 +317,27 @@ void DbObject::SendVarsStatusUpdate(void) } } -double DbObject::GetLastConfigUpdate(void) const +double DbObject::GetLastConfigUpdate() const { return m_LastConfigUpdate; } -double DbObject::GetLastStatusUpdate(void) const +double DbObject::GetLastStatusUpdate() const { return m_LastStatusUpdate; } -void DbObject::OnConfigUpdateHeavy(void) +void DbObject::OnConfigUpdateHeavy() { /* Default handler does nothing. */ } -void DbObject::OnConfigUpdateLight(void) +void DbObject::OnConfigUpdateLight() { /* Default handler does nothing. */ } -void DbObject::OnStatusUpdate(void) +void DbObject::OnStatusUpdate() { /* Default handler does nothing. */ } @@ -419,7 +419,7 @@ void DbObject::VersionChangedHandler(const ConfigObject::Ptr& object) } } -boost::mutex& DbObject::GetStaticMutex(void) +boost::mutex& DbObject::GetStaticMutex() { static boost::mutex mutex; return mutex; diff --git a/lib/db_ido/dbobject.hpp b/lib/db_ido/dbobject.hpp index 592a2c24b..16f23d49c 100644 --- a/lib/db_ido/dbobject.hpp +++ b/lib/db_ido/dbobject.hpp @@ -64,17 +64,17 @@ class DbObject : public Object public: DECLARE_PTR_TYPEDEFS(DbObject); - static void StaticInitialize(void); + static void StaticInitialize(); void SetObject(const ConfigObject::Ptr& object); - ConfigObject::Ptr GetObject(void) const; + ConfigObject::Ptr GetObject() const; - String GetName1(void) const; - String GetName2(void) const; - intrusive_ptr GetType(void) const; + String GetName1() const; + String GetName2() const; + intrusive_ptr GetType() const; - virtual Dictionary::Ptr GetConfigFields(void) const = 0; - virtual Dictionary::Ptr GetStatusFields(void) const = 0; + virtual Dictionary::Ptr GetConfigFields() const = 0; + virtual Dictionary::Ptr GetStatusFields() const = 0; static DbObject::Ptr GetOrCreateByObject(const ConfigObject::Ptr& object); @@ -82,22 +82,22 @@ public: static boost::signals2::signal&)> OnMultipleQueries; void SendConfigUpdateHeavy(const Dictionary::Ptr& configFields); - void SendConfigUpdateLight(void); - void SendStatusUpdate(void); - void SendVarsConfigUpdateHeavy(void); - void SendVarsStatusUpdate(void); + void SendConfigUpdateLight(); + void SendStatusUpdate(); + void SendVarsConfigUpdateHeavy(); + void SendVarsStatusUpdate(); - double GetLastConfigUpdate(void) const; - double GetLastStatusUpdate(void) const; + double GetLastConfigUpdate() const; + double GetLastStatusUpdate() const; virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const; protected: DbObject(const intrusive_ptr& type, const String& name1, const String& name2); - virtual void OnConfigUpdateHeavy(void); - virtual void OnConfigUpdateLight(void); - virtual void OnStatusUpdate(void); + virtual void OnConfigUpdateHeavy(); + virtual void OnConfigUpdateLight(); + virtual void OnStatusUpdate(); static String HashValue(const Value& value); @@ -113,7 +113,7 @@ private: static void VarsChangedHandler(const CustomVarObject::Ptr& object); static void VersionChangedHandler(const ConfigObject::Ptr& object); - static boost::mutex& GetStaticMutex(void); + static boost::mutex& GetStaticMutex(); friend class DbType; }; diff --git a/lib/db_ido/dbquery.cpp b/lib/db_ido/dbquery.cpp index 3fb6226c2..cd3656c1f 100644 --- a/lib/db_ido/dbquery.cpp +++ b/lib/db_ido/dbquery.cpp @@ -27,7 +27,7 @@ INITIALIZE_ONCE(&DbQuery::StaticInitialize); std::map DbQuery::m_CategoryFilterMap; -void DbQuery::StaticInitialize(void) +void DbQuery::StaticInitialize() { ScriptGlobal::Set("DbCatConfig", DbCatConfig); ScriptGlobal::Set("DbCatState", DbCatState); @@ -63,7 +63,7 @@ void DbQuery::StaticInitialize(void) m_CategoryFilterMap["DbCatEverything"] = DbCatEverything; } -const std::map& DbQuery::GetCategoryFilterMap(void) +const std::map& DbQuery::GetCategoryFilterMap() { return m_CategoryFilterMap; } diff --git a/lib/db_ido/dbquery.hpp b/lib/db_ido/dbquery.hpp index 9947d6f74..40c481ea9 100644 --- a/lib/db_ido/dbquery.hpp +++ b/lib/db_ido/dbquery.hpp @@ -74,13 +74,13 @@ struct DbQuery bool StatusUpdate; WorkQueuePriority Priority; - static void StaticInitialize(void); + static void StaticInitialize(); - DbQuery(void) + DbQuery() : Type(0), Category(DbCatInvalid), ConfigUpdate(false), StatusUpdate(false), Priority(PriorityNormal) { } - static const std::map& GetCategoryFilterMap(void); + static const std::map& GetCategoryFilterMap(); private: static std::map m_CategoryFilterMap; diff --git a/lib/db_ido/dbreference.cpp b/lib/db_ido/dbreference.cpp index 7e498f0cd..971001a23 100644 --- a/lib/db_ido/dbreference.cpp +++ b/lib/db_ido/dbreference.cpp @@ -21,7 +21,7 @@ using namespace icinga; -DbReference::DbReference(void) +DbReference::DbReference() : m_Id(-1) { } @@ -29,12 +29,12 @@ DbReference::DbReference(long id) : m_Id(id) { } -bool DbReference::IsValid(void) const +bool DbReference::IsValid() const { return (m_Id != -1); } -DbReference::operator long(void) const +DbReference::operator long() const { return m_Id; } diff --git a/lib/db_ido/dbreference.hpp b/lib/db_ido/dbreference.hpp index 9dba6af5a..d547d83b1 100644 --- a/lib/db_ido/dbreference.hpp +++ b/lib/db_ido/dbreference.hpp @@ -33,11 +33,11 @@ namespace icinga struct DbReference { public: - DbReference(void); + DbReference(); DbReference(long id); - bool IsValid(void) const; - operator long(void) const; + bool IsValid() const; + operator long() const; private: long m_Id; }; diff --git a/lib/db_ido/dbtype.cpp b/lib/db_ido/dbtype.cpp index 46908f5b8..1dc1e3301 100644 --- a/lib/db_ido/dbtype.cpp +++ b/lib/db_ido/dbtype.cpp @@ -29,22 +29,22 @@ DbType::DbType(const String& name, const String& table, long tid, const String& : m_Name(name), m_Table(table), m_TypeID(tid), m_IDColumn(idcolumn), m_ObjectFactory(factory) { } -String DbType::GetName(void) const +String DbType::GetName() const { return m_Name; } -String DbType::GetTable(void) const +String DbType::GetTable() const { return m_Table; } -long DbType::GetTypeID(void) const +long DbType::GetTypeID() const { return m_TypeID; } -String DbType::GetIDColumn(void) const +String DbType::GetIDColumn() const { return m_IDColumn; } @@ -122,7 +122,7 @@ DbObject::Ptr DbType::GetOrCreateObjectByName(const String& name1, const String& return dbobj; } -boost::mutex& DbType::GetStaticMutex(void) +boost::mutex& DbType::GetStaticMutex() { static boost::mutex mutex; return mutex; @@ -131,13 +131,13 @@ boost::mutex& DbType::GetStaticMutex(void) /** * Caller must hold static mutex. */ -DbType::TypeMap& DbType::GetTypes(void) +DbType::TypeMap& DbType::GetTypes() { static DbType::TypeMap tm; return tm; } -std::set DbType::GetAllTypes(void) +std::set DbType::GetAllTypes() { std::set result; @@ -151,7 +151,7 @@ std::set DbType::GetAllTypes(void) return result; } -DbTypeRegistry *DbTypeRegistry::GetInstance(void) +DbTypeRegistry *DbTypeRegistry::GetInstance() { return Singleton::GetInstance(); } diff --git a/lib/db_ido/dbtype.hpp b/lib/db_ido/dbtype.hpp index 2f79e8c64..cc1e9b3d2 100644 --- a/lib/db_ido/dbtype.hpp +++ b/lib/db_ido/dbtype.hpp @@ -47,10 +47,10 @@ public: DbType(const String& name, const String& table, long tid, const String& idcolumn, const ObjectFactory& factory); - String GetName(void) const; - String GetTable(void) const; - long GetTypeID(void) const; - String GetIDColumn(void) const; + String GetName() const; + String GetTable() const; + long GetTypeID() const; + String GetIDColumn() const; static void RegisterType(const DbType::Ptr& type); @@ -59,7 +59,7 @@ public: intrusive_ptr GetOrCreateObjectByName(const String& name1, const String& name2); - static std::set GetAllTypes(void); + static std::set GetAllTypes(); private: String m_Name; @@ -68,8 +68,8 @@ private: String m_IDColumn; ObjectFactory m_ObjectFactory; - static boost::mutex& GetStaticMutex(void); - static TypeMap& GetTypes(void); + static boost::mutex& GetStaticMutex(); + static TypeMap& GetTypes(); ObjectMap m_Objects; }; @@ -82,7 +82,7 @@ private: class DbTypeRegistry : public Registry { public: - static DbTypeRegistry *GetInstance(void); + static DbTypeRegistry *GetInstance(); }; /** diff --git a/lib/db_ido/dbvalue.cpp b/lib/db_ido/dbvalue.cpp index d48cec3da..2c4a2750f 100644 --- a/lib/db_ido/dbvalue.cpp +++ b/lib/db_ido/dbvalue.cpp @@ -33,7 +33,7 @@ Value DbValue::FromTimestamp(const Value& ts) return new DbValue(DbValueTimestamp, ts); } -Value DbValue::FromTimestampNow(void) +Value DbValue::FromTimestampNow() { return new DbValue(DbValueTimestampNow, Empty); } @@ -84,12 +84,12 @@ Value DbValue::ExtractValue(const Value& value) return dbv->GetValue(); } -DbValueType DbValue::GetType(void) const +DbValueType DbValue::GetType() const { return m_Type; } -Value DbValue::GetValue(void) const +Value DbValue::GetValue() const { return m_Value; } diff --git a/lib/db_ido/dbvalue.hpp b/lib/db_ido/dbvalue.hpp index ac3fbc8df..aad636ac6 100644 --- a/lib/db_ido/dbvalue.hpp +++ b/lib/db_ido/dbvalue.hpp @@ -47,7 +47,7 @@ public: DbValue(DbValueType type, const Value& value); static Value FromTimestamp(const Value& ts); - static Value FromTimestampNow(void); + static Value FromTimestampNow(); static Value FromValue(const Value& value); static Value FromObjectInsertID(const Value& value); @@ -57,9 +57,9 @@ public: static Value ExtractValue(const Value& value); - DbValueType GetType(void) const; + DbValueType GetType() const; - Value GetValue(void) const; + Value GetValue() const; void SetValue(const Value& value); private: diff --git a/lib/db_ido/endpointdbobject.cpp b/lib/db_ido/endpointdbobject.cpp index a6ac189d9..2402cadaf 100644 --- a/lib/db_ido/endpointdbobject.cpp +++ b/lib/db_ido/endpointdbobject.cpp @@ -34,7 +34,7 @@ REGISTER_DBTYPE(Endpoint, "endpoint", DbObjectTypeEndpoint, "endpoint_object_id" INITIALIZE_ONCE(&EndpointDbObject::StaticInitialize); -void EndpointDbObject::StaticInitialize(void) +void EndpointDbObject::StaticInitialize() { Endpoint::OnConnected.connect(std::bind(&EndpointDbObject::UpdateConnectedStatus, _1)); Endpoint::OnDisconnected.connect(std::bind(&EndpointDbObject::UpdateConnectedStatus, _1)); @@ -44,7 +44,7 @@ EndpointDbObject::EndpointDbObject(const DbType::Ptr& type, const String& name1, : DbObject(type, name1, name2) { } -Dictionary::Ptr EndpointDbObject::GetConfigFields(void) const +Dictionary::Ptr EndpointDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); Endpoint::Ptr endpoint = static_pointer_cast(GetObject()); @@ -56,7 +56,7 @@ Dictionary::Ptr EndpointDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr EndpointDbObject::GetStatusFields(void) const +Dictionary::Ptr EndpointDbObject::GetStatusFields() const { Dictionary::Ptr fields = new Dictionary(); Endpoint::Ptr endpoint = static_pointer_cast(GetObject()); diff --git a/lib/db_ido/endpointdbobject.hpp b/lib/db_ido/endpointdbobject.hpp index b773f6241..a10de9ccd 100644 --- a/lib/db_ido/endpointdbobject.hpp +++ b/lib/db_ido/endpointdbobject.hpp @@ -39,10 +39,10 @@ public: EndpointDbObject(const intrusive_ptr& type, const String& name1, const String& name2); - static void StaticInitialize(void); + static void StaticInitialize(); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; private: static void UpdateConnectedStatus(const Endpoint::Ptr& endpoint); diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp index 79328c38c..0dc0abc3f 100644 --- a/lib/db_ido/hostdbobject.cpp +++ b/lib/db_ido/hostdbobject.cpp @@ -42,7 +42,7 @@ HostDbObject::HostDbObject(const DbType::Ptr& type, const String& name1, const S : DbObject(type, name1, name2) { } -Dictionary::Ptr HostDbObject::GetConfigFields(void) const +Dictionary::Ptr HostDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); Host::Ptr host = static_pointer_cast(GetObject()); @@ -109,7 +109,7 @@ Dictionary::Ptr HostDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr HostDbObject::GetStatusFields(void) const +Dictionary::Ptr HostDbObject::GetStatusFields() const { Dictionary::Ptr fields = new Dictionary(); Host::Ptr host = static_pointer_cast(GetObject()); @@ -176,7 +176,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const return fields; } -void HostDbObject::OnConfigUpdateHeavy(void) +void HostDbObject::OnConfigUpdateHeavy() { Host::Ptr host = static_pointer_cast(GetObject()); @@ -366,12 +366,12 @@ void HostDbObject::OnConfigUpdateHeavy(void) DoCommonConfigUpdate(); } -void HostDbObject::OnConfigUpdateLight(void) +void HostDbObject::OnConfigUpdateLight() { DoCommonConfigUpdate(); } -void HostDbObject::DoCommonConfigUpdate(void) +void HostDbObject::DoCommonConfigUpdate() { Host::Ptr host = static_pointer_cast(GetObject()); diff --git a/lib/db_ido/hostdbobject.hpp b/lib/db_ido/hostdbobject.hpp index 68fc4307a..31e799d47 100644 --- a/lib/db_ido/hostdbobject.hpp +++ b/lib/db_ido/hostdbobject.hpp @@ -38,16 +38,16 @@ public: HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy(void) override; - virtual void OnConfigUpdateLight(void) override; + virtual void OnConfigUpdateHeavy() override; + virtual void OnConfigUpdateLight() override; virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; private: - void DoCommonConfigUpdate(void); + void DoCommonConfigUpdate(); }; } diff --git a/lib/db_ido/hostgroupdbobject.cpp b/lib/db_ido/hostgroupdbobject.cpp index f36646864..73996a628 100644 --- a/lib/db_ido/hostgroupdbobject.cpp +++ b/lib/db_ido/hostgroupdbobject.cpp @@ -32,7 +32,7 @@ HostGroupDbObject::HostGroupDbObject(const DbType::Ptr& type, const String& name : DbObject(type, name1, name2) { } -Dictionary::Ptr HostGroupDbObject::GetConfigFields(void) const +Dictionary::Ptr HostGroupDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); HostGroup::Ptr group = static_pointer_cast(GetObject()); @@ -45,7 +45,7 @@ Dictionary::Ptr HostGroupDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr HostGroupDbObject::GetStatusFields(void) const +Dictionary::Ptr HostGroupDbObject::GetStatusFields() const { return nullptr; } diff --git a/lib/db_ido/hostgroupdbobject.hpp b/lib/db_ido/hostgroupdbobject.hpp index 4033f9b3a..7b948b62e 100644 --- a/lib/db_ido/hostgroupdbobject.hpp +++ b/lib/db_ido/hostgroupdbobject.hpp @@ -39,8 +39,8 @@ public: HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; private: static void MembersChangedHandler(const HostGroup::Ptr& hgfilter); diff --git a/lib/db_ido/idochecktask.hpp b/lib/db_ido/idochecktask.hpp index 7c66cc077..8f73b36cd 100644 --- a/lib/db_ido/idochecktask.hpp +++ b/lib/db_ido/idochecktask.hpp @@ -38,7 +38,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - IdoCheckTask(void); + IdoCheckTask(); }; } diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp index b3f563def..2c82e8b23 100644 --- a/lib/db_ido/servicedbobject.cpp +++ b/lib/db_ido/servicedbobject.cpp @@ -47,7 +47,7 @@ ServiceDbObject::ServiceDbObject(const DbType::Ptr& type, const String& name1, c : DbObject(type, name1, name2) { } -Dictionary::Ptr ServiceDbObject::GetConfigFields(void) const +Dictionary::Ptr ServiceDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); Service::Ptr service = static_pointer_cast(GetObject()); @@ -105,7 +105,7 @@ Dictionary::Ptr ServiceDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const +Dictionary::Ptr ServiceDbObject::GetStatusFields() const { Dictionary::Ptr fields = new Dictionary(); Service::Ptr service = static_pointer_cast(GetObject()); @@ -170,7 +170,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const return fields; } -void ServiceDbObject::OnConfigUpdateHeavy(void) +void ServiceDbObject::OnConfigUpdateHeavy() { Service::Ptr service = static_pointer_cast(GetObject()); @@ -328,12 +328,12 @@ void ServiceDbObject::OnConfigUpdateHeavy(void) DoCommonConfigUpdate(); } -void ServiceDbObject::OnConfigUpdateLight(void) +void ServiceDbObject::OnConfigUpdateLight() { DoCommonConfigUpdate(); } -void ServiceDbObject::DoCommonConfigUpdate(void) +void ServiceDbObject::DoCommonConfigUpdate() { Service::Ptr service = static_pointer_cast(GetObject()); diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp index b10c56108..98990fd24 100644 --- a/lib/db_ido/servicedbobject.hpp +++ b/lib/db_ido/servicedbobject.hpp @@ -39,18 +39,18 @@ public: ServiceDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - static void StaticInitialize(void); + static void StaticInitialize(); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy(void) override; - virtual void OnConfigUpdateLight(void) override; + virtual void OnConfigUpdateHeavy() override; + virtual void OnConfigUpdateLight() override; virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; private: - void DoCommonConfigUpdate(void); + void DoCommonConfigUpdate(); }; } diff --git a/lib/db_ido/servicegroupdbobject.cpp b/lib/db_ido/servicegroupdbobject.cpp index 6b1a36d05..153914b0d 100644 --- a/lib/db_ido/servicegroupdbobject.cpp +++ b/lib/db_ido/servicegroupdbobject.cpp @@ -31,7 +31,7 @@ ServiceGroupDbObject::ServiceGroupDbObject(const DbType::Ptr& type, const String : DbObject(type, name1, name2) { } -Dictionary::Ptr ServiceGroupDbObject::GetConfigFields(void) const +Dictionary::Ptr ServiceGroupDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); ServiceGroup::Ptr group = static_pointer_cast(GetObject()); @@ -44,7 +44,7 @@ Dictionary::Ptr ServiceGroupDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr ServiceGroupDbObject::GetStatusFields(void) const +Dictionary::Ptr ServiceGroupDbObject::GetStatusFields() const { return nullptr; } diff --git a/lib/db_ido/servicegroupdbobject.hpp b/lib/db_ido/servicegroupdbobject.hpp index e7a2601cc..da08968c3 100644 --- a/lib/db_ido/servicegroupdbobject.hpp +++ b/lib/db_ido/servicegroupdbobject.hpp @@ -39,8 +39,8 @@ public: ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/timeperioddbobject.cpp b/lib/db_ido/timeperioddbobject.cpp index 45352f347..3bb392be2 100644 --- a/lib/db_ido/timeperioddbobject.cpp +++ b/lib/db_ido/timeperioddbobject.cpp @@ -34,7 +34,7 @@ TimePeriodDbObject::TimePeriodDbObject(const DbType::Ptr& type, const String& na : DbObject(type, name1, name2) { } -Dictionary::Ptr TimePeriodDbObject::GetConfigFields(void) const +Dictionary::Ptr TimePeriodDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); TimePeriod::Ptr tp = static_pointer_cast(GetObject()); @@ -44,12 +44,12 @@ Dictionary::Ptr TimePeriodDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr TimePeriodDbObject::GetStatusFields(void) const +Dictionary::Ptr TimePeriodDbObject::GetStatusFields() const { return Empty; } -void TimePeriodDbObject::OnConfigUpdateHeavy(void) +void TimePeriodDbObject::OnConfigUpdateHeavy() { TimePeriod::Ptr tp = static_pointer_cast(GetObject()); diff --git a/lib/db_ido/timeperioddbobject.hpp b/lib/db_ido/timeperioddbobject.hpp index 2f110db53..171c2d70b 100644 --- a/lib/db_ido/timeperioddbobject.hpp +++ b/lib/db_ido/timeperioddbobject.hpp @@ -39,10 +39,10 @@ public: TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2); protected: - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy(void) override; + virtual void OnConfigUpdateHeavy() override; }; } diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp index 0cd94509c..d369b38c6 100644 --- a/lib/db_ido/userdbobject.cpp +++ b/lib/db_ido/userdbobject.cpp @@ -35,7 +35,7 @@ UserDbObject::UserDbObject(const DbType::Ptr& type, const String& name1, const S : DbObject(type, name1, name2) { } -Dictionary::Ptr UserDbObject::GetConfigFields(void) const +Dictionary::Ptr UserDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); User::Ptr user = static_pointer_cast(GetObject()); @@ -66,7 +66,7 @@ Dictionary::Ptr UserDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr UserDbObject::GetStatusFields(void) const +Dictionary::Ptr UserDbObject::GetStatusFields() const { Dictionary::Ptr fields = new Dictionary(); User::Ptr user = static_pointer_cast(GetObject()); @@ -79,7 +79,7 @@ Dictionary::Ptr UserDbObject::GetStatusFields(void) const return fields; } -void UserDbObject::OnConfigUpdateHeavy(void) +void UserDbObject::OnConfigUpdateHeavy() { User::Ptr user = static_pointer_cast(GetObject()); diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp index 5f55fd175..0ce3480a2 100644 --- a/lib/db_ido/userdbobject.hpp +++ b/lib/db_ido/userdbobject.hpp @@ -39,10 +39,10 @@ public: UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2); protected: - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy(void) override; + virtual void OnConfigUpdateHeavy() override; virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; }; diff --git a/lib/db_ido/usergroupdbobject.cpp b/lib/db_ido/usergroupdbobject.cpp index dd1d5edf0..f38b8a55b 100644 --- a/lib/db_ido/usergroupdbobject.cpp +++ b/lib/db_ido/usergroupdbobject.cpp @@ -32,7 +32,7 @@ UserGroupDbObject::UserGroupDbObject(const DbType::Ptr& type, const String& name : DbObject(type, name1, name2) { } -Dictionary::Ptr UserGroupDbObject::GetConfigFields(void) const +Dictionary::Ptr UserGroupDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); UserGroup::Ptr group = static_pointer_cast(GetObject()); @@ -42,7 +42,7 @@ Dictionary::Ptr UserGroupDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr UserGroupDbObject::GetStatusFields(void) const +Dictionary::Ptr UserGroupDbObject::GetStatusFields() const { return nullptr; } diff --git a/lib/db_ido/usergroupdbobject.hpp b/lib/db_ido/usergroupdbobject.hpp index 8e3aa6204..7a04cb41a 100644 --- a/lib/db_ido/usergroupdbobject.hpp +++ b/lib/db_ido/usergroupdbobject.hpp @@ -39,8 +39,8 @@ public: UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/zonedbobject.cpp b/lib/db_ido/zonedbobject.cpp index 0f48d0919..252130b98 100644 --- a/lib/db_ido/zonedbobject.cpp +++ b/lib/db_ido/zonedbobject.cpp @@ -31,7 +31,7 @@ ZoneDbObject::ZoneDbObject(const DbType::Ptr& type, const String& name1, const S : DbObject(type, name1, name2) { } -Dictionary::Ptr ZoneDbObject::GetConfigFields(void) const +Dictionary::Ptr ZoneDbObject::GetConfigFields() const { Dictionary::Ptr fields = new Dictionary(); Zone::Ptr zone = static_pointer_cast(GetObject()); @@ -42,7 +42,7 @@ Dictionary::Ptr ZoneDbObject::GetConfigFields(void) const return fields; } -Dictionary::Ptr ZoneDbObject::GetStatusFields(void) const +Dictionary::Ptr ZoneDbObject::GetStatusFields() const { Zone::Ptr zone = static_pointer_cast(GetObject()); diff --git a/lib/db_ido/zonedbobject.hpp b/lib/db_ido/zonedbobject.hpp index 433487751..815d00542 100644 --- a/lib/db_ido/zonedbobject.hpp +++ b/lib/db_ido/zonedbobject.hpp @@ -39,8 +39,8 @@ public: ZoneDbObject(const intrusive_ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const override; - virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual Dictionary::Ptr GetConfigFields() const override; + virtual Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index 69e3778b5..481c08d04 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -37,11 +37,11 @@ using namespace icinga; REGISTER_TYPE(IdoMysqlConnection); REGISTER_STATSFUNCTION(IdoMysqlConnection, &IdoMysqlConnection::StatsFunc); -IdoMysqlConnection::IdoMysqlConnection(void) +IdoMysqlConnection::IdoMysqlConnection() : m_QueryQueue(10000000) { } -void IdoMysqlConnection::OnConfigLoaded(void) +void IdoMysqlConnection::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -84,7 +84,7 @@ void IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::P status->Set("idomysqlconnection", nodes); } -void IdoMysqlConnection::Resume(void) +void IdoMysqlConnection::Resume() { DbConnection::Resume(); @@ -109,7 +109,7 @@ void IdoMysqlConnection::Resume(void) ASSERT(m_Mysql->thread_safe()); } -void IdoMysqlConnection::Pause(void) +void IdoMysqlConnection::Pause() { Log(LogInformation, "IdoMysqlConnection") << "'" << GetName() << "' paused."; @@ -141,12 +141,12 @@ void IdoMysqlConnection::ExceptionHandler(boost::exception_ptr exp) } } -void IdoMysqlConnection::AssertOnWorkQueue(void) +void IdoMysqlConnection::AssertOnWorkQueue() { ASSERT(m_QueryQueue.IsWorkerThread()); } -void IdoMysqlConnection::Disconnect(void) +void IdoMysqlConnection::Disconnect() { AssertOnWorkQueue(); @@ -159,12 +159,12 @@ void IdoMysqlConnection::Disconnect(void) SetConnected(false); } -void IdoMysqlConnection::TxTimerHandler(void) +void IdoMysqlConnection::TxTimerHandler() { NewTransaction(); } -void IdoMysqlConnection::NewTransaction(void) +void IdoMysqlConnection::NewTransaction() { #ifdef I2_DEBUG /* I2_DEBUG */ Log(LogDebug, "IdoMysqlConnection") @@ -175,7 +175,7 @@ void IdoMysqlConnection::NewTransaction(void) m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::FinishAsyncQueries, this), PriorityHigh); } -void IdoMysqlConnection::InternalNewTransaction(void) +void IdoMysqlConnection::InternalNewTransaction() { AssertOnWorkQueue(); @@ -186,7 +186,7 @@ void IdoMysqlConnection::InternalNewTransaction(void) AsyncQuery("BEGIN"); } -void IdoMysqlConnection::ReconnectTimerHandler(void) +void IdoMysqlConnection::ReconnectTimerHandler() { #ifdef I2_DEBUG /* I2_DEBUG */ Log(LogDebug, "IdoMysqlConnection") @@ -196,7 +196,7 @@ void IdoMysqlConnection::ReconnectTimerHandler(void) m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::Reconnect, this), PriorityLow); } -void IdoMysqlConnection::Reconnect(void) +void IdoMysqlConnection::Reconnect() { AssertOnWorkQueue(); @@ -473,7 +473,7 @@ void IdoMysqlConnection::FinishConnect(double startTime) Query("BEGIN"); } -void IdoMysqlConnection::ClearTablesBySession(void) +void IdoMysqlConnection::ClearTablesBySession() { /* delete all comments and downtimes without current session token */ ClearTableBySession("comments"); @@ -505,7 +505,7 @@ void IdoMysqlConnection::AsyncQuery(const String& query, const std::function queries; m_AsyncQueries.swap(queries); @@ -649,14 +649,14 @@ IdoMysqlResult IdoMysqlConnection::Query(const String& query) return IdoMysqlResult(result, std::bind(&MysqlInterface::free_result, std::cref(m_Mysql), _1)); } -DbReference IdoMysqlConnection::GetLastInsertID(void) +DbReference IdoMysqlConnection::GetLastInsertID() { AssertOnWorkQueue(); return DbReference(m_Mysql->insert_id(&m_Connection)); } -int IdoMysqlConnection::GetAffectedRows(void) +int IdoMysqlConnection::GetAffectedRows() { AssertOnWorkQueue(); @@ -1169,7 +1169,7 @@ void IdoMysqlConnection::FillIDCache(const DbType::Ptr& type) } } -int IdoMysqlConnection::GetPendingQueryCount(void) const +int IdoMysqlConnection::GetPendingQueryCount() const { return m_QueryQueue.GetLength(); } diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp index 357fe200b..85d89a10d 100644 --- a/lib/db_ido_mysql/idomysqlconnection.hpp +++ b/lib/db_ido_mysql/idomysqlconnection.hpp @@ -51,16 +51,16 @@ public: DECLARE_OBJECT(IdoMysqlConnection); DECLARE_OBJECTNAME(IdoMysqlConnection); - IdoMysqlConnection(void); + IdoMysqlConnection(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual int GetPendingQueryCount(void) const override; + virtual int GetPendingQueryCount() const override; protected: - virtual void OnConfigLoaded(void) override; - virtual void Resume(void) override; - virtual void Pause(void) override; + virtual void OnConfigLoaded() override; + virtual void Resume() override; + virtual void Pause() override; virtual void ActivateObject(const DbObject::Ptr& dbobj) override; virtual void DeactivateObject(const DbObject::Ptr& dbobj) override; @@ -68,7 +68,7 @@ protected: virtual void ExecuteMultipleQueries(const std::vector& queries) override; virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; virtual void FillIDCache(const DbType::Ptr& type) override; - virtual void NewTransaction(void) override; + virtual void NewTransaction() override; private: DbReference m_InstanceID; @@ -88,26 +88,26 @@ private: Timer::Ptr m_TxTimer; IdoMysqlResult Query(const String& query); - DbReference GetLastInsertID(void); - int GetAffectedRows(void); + DbReference GetLastInsertID(); + int GetAffectedRows(); String Escape(const String& s); Dictionary::Ptr FetchRow(const IdoMysqlResult& result); void DiscardRows(const IdoMysqlResult& result); void AsyncQuery(const String& query, const IdoAsyncCallback& callback = IdoAsyncCallback()); - void FinishAsyncQueries(void); + void FinishAsyncQueries(); bool FieldToEscapedString(const String& key, const Value& value, Value *result); void InternalActivateObject(const DbObject::Ptr& dbobj); void InternalDeactivateObject(const DbObject::Ptr& dbobj); - void Disconnect(void); - void Reconnect(void); + void Disconnect(); + void Reconnect(); - void AssertOnWorkQueue(void); + void AssertOnWorkQueue(); - void TxTimerHandler(void); - void ReconnectTimerHandler(void); + void TxTimerHandler(); + void ReconnectTimerHandler(); bool CanExecuteQuery(const DbQuery& query); @@ -116,10 +116,10 @@ private: void FinishExecuteQuery(const DbQuery& query, int type, bool upsert); void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value); - void InternalNewTransaction(void); + void InternalNewTransaction(); void ClearTableBySession(const String& table); - void ClearTablesBySession(void); + void ClearTablesBySession(); void ExceptionHandler(boost::exception_ptr exp); diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index 7ed0d7170..b89bf4d20 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -39,13 +39,13 @@ REGISTER_TYPE(IdoPgsqlConnection); REGISTER_STATSFUNCTION(IdoPgsqlConnection, &IdoPgsqlConnection::StatsFunc); -IdoPgsqlConnection::IdoPgsqlConnection(void) +IdoPgsqlConnection::IdoPgsqlConnection() : m_QueryQueue(1000000) { m_QueryQueue.SetName("IdoPgsqlConnection, " + GetName()); } -void IdoPgsqlConnection::OnConfigLoaded(void) +void IdoPgsqlConnection::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -88,7 +88,7 @@ void IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::P status->Set("idopgsqlconnection", nodes); } -void IdoPgsqlConnection::Resume(void) +void IdoPgsqlConnection::Resume() { DbConnection::Resume(); @@ -113,7 +113,7 @@ void IdoPgsqlConnection::Resume(void) ASSERT(m_Pgsql->isthreadsafe()); } -void IdoPgsqlConnection::Pause(void) +void IdoPgsqlConnection::Pause() { Log(LogInformation, "IdoPgsqlConnection") << "'" << GetName() << "' paused."; @@ -139,12 +139,12 @@ void IdoPgsqlConnection::ExceptionHandler(boost::exception_ptr exp) } } -void IdoPgsqlConnection::AssertOnWorkQueue(void) +void IdoPgsqlConnection::AssertOnWorkQueue() { ASSERT(m_QueryQueue.IsWorkerThread()); } -void IdoPgsqlConnection::Disconnect(void) +void IdoPgsqlConnection::Disconnect() { AssertOnWorkQueue(); @@ -157,17 +157,17 @@ void IdoPgsqlConnection::Disconnect(void) SetConnected(false); } -void IdoPgsqlConnection::TxTimerHandler(void) +void IdoPgsqlConnection::TxTimerHandler() { NewTransaction(); } -void IdoPgsqlConnection::NewTransaction(void) +void IdoPgsqlConnection::NewTransaction() { m_QueryQueue.Enqueue(std::bind(&IdoPgsqlConnection::InternalNewTransaction, this), PriorityHigh, true); } -void IdoPgsqlConnection::InternalNewTransaction(void) +void IdoPgsqlConnection::InternalNewTransaction() { AssertOnWorkQueue(); @@ -178,12 +178,12 @@ void IdoPgsqlConnection::InternalNewTransaction(void) Query("BEGIN"); } -void IdoPgsqlConnection::ReconnectTimerHandler(void) +void IdoPgsqlConnection::ReconnectTimerHandler() { m_QueryQueue.Enqueue(std::bind(&IdoPgsqlConnection::Reconnect, this), PriorityLow); } -void IdoPgsqlConnection::Reconnect(void) +void IdoPgsqlConnection::Reconnect() { AssertOnWorkQueue(); @@ -422,7 +422,7 @@ void IdoPgsqlConnection::FinishConnect(double startTime) Query("BEGIN"); } -void IdoPgsqlConnection::ClearTablesBySession(void) +void IdoPgsqlConnection::ClearTablesBySession() { /* delete all comments and downtimes without current session token */ ClearTableBySession("comments"); @@ -500,7 +500,7 @@ DbReference IdoPgsqlConnection::GetSequenceValue(const String& table, const Stri return DbReference(Convert::ToLong(row->Get("id"))); } -int IdoPgsqlConnection::GetAffectedRows(void) +int IdoPgsqlConnection::GetAffectedRows() { AssertOnWorkQueue(); @@ -947,7 +947,7 @@ void IdoPgsqlConnection::FillIDCache(const DbType::Ptr& type) } } -int IdoPgsqlConnection::GetPendingQueryCount(void) const +int IdoPgsqlConnection::GetPendingQueryCount() const { return m_QueryQueue.GetLength(); } diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp index 69cd57ef2..9a3d20907 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.hpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp @@ -43,16 +43,16 @@ public: DECLARE_OBJECT(IdoPgsqlConnection); DECLARE_OBJECTNAME(IdoPgsqlConnection); - IdoPgsqlConnection(void); + IdoPgsqlConnection(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual int GetPendingQueryCount(void) const override; + virtual int GetPendingQueryCount() const override; protected: - virtual void OnConfigLoaded(void) override; - virtual void Resume(void) override; - virtual void Pause(void) override; + virtual void OnConfigLoaded() override; + virtual void Resume() override; + virtual void Pause() override; virtual void ActivateObject(const DbObject::Ptr& dbobj) override; virtual void DeactivateObject(const DbObject::Ptr& dbobj) override; @@ -60,7 +60,7 @@ protected: virtual void ExecuteMultipleQueries(const std::vector& queries) override; virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; virtual void FillIDCache(const DbType::Ptr& type) override; - virtual void NewTransaction(void) override; + virtual void NewTransaction() override; private: DbReference m_InstanceID; @@ -78,7 +78,7 @@ private: IdoPgsqlResult Query(const String& query); DbReference GetSequenceValue(const String& table, const String& column); - int GetAffectedRows(void); + int GetAffectedRows(); String Escape(const String& s); Dictionary::Ptr FetchRow(const IdoPgsqlResult& result, int row); @@ -86,16 +86,16 @@ private: void InternalActivateObject(const DbObject::Ptr& dbobj); void InternalDeactivateObject(const DbObject::Ptr& dbobj); - void Disconnect(void); - void InternalNewTransaction(void); - void Reconnect(void); + void Disconnect(); + void InternalNewTransaction(); + void Reconnect(); - void AssertOnWorkQueue(void); + void AssertOnWorkQueue(); - void TxTimerHandler(void); - void ReconnectTimerHandler(void); + void TxTimerHandler(); + void ReconnectTimerHandler(); - void StatsLoggerTimerHandler(void); + void StatsLoggerTimerHandler(); bool CanExecuteQuery(const DbQuery& query); @@ -104,7 +104,7 @@ private: void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value); void ClearTableBySession(const String& table); - void ClearTablesBySession(void); + void ClearTablesBySession(); void ExceptionHandler(boost::exception_ptr exp); diff --git a/lib/demo/demo.cpp b/lib/demo/demo.cpp index 072defc8f..bb55046fa 100644 --- a/lib/demo/demo.cpp +++ b/lib/demo/demo.cpp @@ -46,7 +46,7 @@ void Demo::Start(bool runtimeCreated) /** * Periodically broadcasts an API message. */ -void Demo::DemoTimerHandler(void) +void Demo::DemoTimerHandler() { Dictionary::Ptr message = new Dictionary(); message->Set("method", "demo::HelloWorld"); diff --git a/lib/demo/demo.hpp b/lib/demo/demo.hpp index f4a8b256a..adba73026 100644 --- a/lib/demo/demo.hpp +++ b/lib/demo/demo.hpp @@ -44,7 +44,7 @@ public: private: Timer::Ptr m_DemoTimer; - void DemoTimerHandler(void); + void DemoTimerHandler(); }; } diff --git a/lib/hello/helloapplication.cpp b/lib/hello/helloapplication.cpp index f9e3e8fc4..03a119422 100644 --- a/lib/hello/helloapplication.cpp +++ b/lib/hello/helloapplication.cpp @@ -36,7 +36,7 @@ INITIALIZE_ONCE([]() { * * @returns An exit status. */ -int HelloApplication::Main(void) +int HelloApplication::Main() { Log(LogInformation, "HelloApplication", "Hello World!"); diff --git a/lib/hello/helloapplication.hpp b/lib/hello/helloapplication.hpp index 2dcbaeeb4..a4f6bd111 100644 --- a/lib/hello/helloapplication.hpp +++ b/lib/hello/helloapplication.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(HelloApplication); DECLARE_OBJECTNAME(HelloApplication); - virtual int Main(void) override; + virtual int Main() override; }; } diff --git a/lib/icinga/apievents.cpp b/lib/icinga/apievents.cpp index ba9cc0049..2090bda0c 100644 --- a/lib/icinga/apievents.cpp +++ b/lib/icinga/apievents.cpp @@ -28,7 +28,7 @@ using namespace icinga; INITIALIZE_ONCE(&ApiEvents::StaticInitialize); -void ApiEvents::StaticInitialize(void) +void ApiEvents::StaticInitialize() { Checkable::OnNewCheckResult.connect(&ApiEvents::CheckResultHandler); Checkable::OnStateChange.connect(&ApiEvents::StateChangeHandler); diff --git a/lib/icinga/apievents.hpp b/lib/icinga/apievents.hpp index 3937f77a6..41c909a99 100644 --- a/lib/icinga/apievents.hpp +++ b/lib/icinga/apievents.hpp @@ -32,7 +32,7 @@ namespace icinga class ApiEvents { public: - static void StaticInitialize(void); + static void StaticInitialize(); static void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin); static void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type, const MessageOrigin::Ptr& origin); diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index b8d0cadf8..dd34d9d23 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -43,12 +43,12 @@ boost::signals2::signal Checkable::OnNextCheckUpda boost::mutex Checkable::m_StatsMutex; int Checkable::m_PendingChecks = 0; -CheckCommand::Ptr Checkable::GetCheckCommand(void) const +CheckCommand::Ptr Checkable::GetCheckCommand() const { return dynamic_pointer_cast(NavigateCheckCommandRaw()); } -TimePeriod::Ptr Checkable::GetCheckPeriod(void) const +TimePeriod::Ptr Checkable::GetCheckPeriod() const { return TimePeriod::GetByName(GetCheckPeriodRaw()); } @@ -58,7 +58,7 @@ void Checkable::SetSchedulingOffset(long offset) m_SchedulingOffset = offset; } -long Checkable::GetSchedulingOffset(void) +long Checkable::GetSchedulingOffset() { return m_SchedulingOffset; } @@ -83,12 +83,12 @@ void Checkable::UpdateNextCheck(const MessageOrigin::Ptr& origin) SetNextCheck(now - adj + interval, false, origin); } -bool Checkable::HasBeenChecked(void) const +bool Checkable::HasBeenChecked() const { return GetLastCheckResult() != nullptr; } -double Checkable::GetLastCheck(void) const +double Checkable::GetLastCheck() const { CheckResult::Ptr cr = GetLastCheckResult(); double schedule_end = -1; @@ -410,7 +410,7 @@ void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros) GetCheckCommand()->Execute(this, cr, resolvedMacros, true); } -void Checkable::ExecuteCheck(void) +void Checkable::ExecuteCheck() { CONTEXT("Executing check for object '" + GetName() + "'"); @@ -525,19 +525,19 @@ void Checkable::UpdateStatistics(const CheckResult::Ptr& cr, CheckableType type) } } -void Checkable::IncreasePendingChecks(void) +void Checkable::IncreasePendingChecks() { boost::mutex::scoped_lock lock(m_StatsMutex); m_PendingChecks++; } -void Checkable::DecreasePendingChecks(void) +void Checkable::DecreasePendingChecks() { boost::mutex::scoped_lock lock(m_StatsMutex); m_PendingChecks--; } -int Checkable::GetPendingChecks(void) +int Checkable::GetPendingChecks() { boost::mutex::scoped_lock lock(m_StatsMutex); return m_PendingChecks; diff --git a/lib/icinga/checkable-comment.cpp b/lib/icinga/checkable-comment.cpp index 9e4893dd2..25b828ca3 100644 --- a/lib/icinga/checkable-comment.cpp +++ b/lib/icinga/checkable-comment.cpp @@ -28,7 +28,7 @@ using namespace icinga; -void Checkable::RemoveAllComments(void) +void Checkable::RemoveAllComments() { for (const Comment::Ptr& comment : GetComments()) { Comment::RemoveComment(comment->GetName()); @@ -47,7 +47,7 @@ void Checkable::RemoveCommentsByType(int type) } } -std::set Checkable::GetComments(void) const +std::set Checkable::GetComments() const { boost::mutex::scoped_lock lock(m_CommentMutex); return m_Comments; diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp index 0865d0f79..ffad0cba8 100644 --- a/lib/icinga/checkable-dependency.cpp +++ b/lib/icinga/checkable-dependency.cpp @@ -35,7 +35,7 @@ void Checkable::RemoveDependency(const Dependency::Ptr& dep) m_Dependencies.erase(dep); } -std::vector Checkable::GetDependencies(void) const +std::vector Checkable::GetDependencies() const { boost::mutex::scoped_lock lock(m_DependencyMutex); return std::vector(m_Dependencies.begin(), m_Dependencies.end()); @@ -53,7 +53,7 @@ void Checkable::RemoveReverseDependency(const Dependency::Ptr& dep) m_ReverseDependencies.erase(dep); } -std::vector Checkable::GetReverseDependencies(void) const +std::vector Checkable::GetReverseDependencies() const { boost::mutex::scoped_lock lock(m_DependencyMutex); return std::vector(m_ReverseDependencies.begin(), m_ReverseDependencies.end()); @@ -101,7 +101,7 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency return true; } -std::set Checkable::GetParents(void) const +std::set Checkable::GetParents() const { std::set parents; @@ -115,7 +115,7 @@ std::set Checkable::GetParents(void) const return parents; } -std::set Checkable::GetChildren(void) const +std::set Checkable::GetChildren() const { std::set parents; @@ -129,7 +129,7 @@ std::set Checkable::GetChildren(void) const return parents; } -std::set Checkable::GetAllChildren(void) const +std::set Checkable::GetAllChildren() const { std::set children = GetChildren(); diff --git a/lib/icinga/checkable-downtime.cpp b/lib/icinga/checkable-downtime.cpp index 92ebe7a80..3222986da 100644 --- a/lib/icinga/checkable-downtime.cpp +++ b/lib/icinga/checkable-downtime.cpp @@ -26,21 +26,21 @@ using namespace icinga; -void Checkable::RemoveAllDowntimes(void) +void Checkable::RemoveAllDowntimes() { for (const Downtime::Ptr& downtime : GetDowntimes()) { Downtime::RemoveDowntime(downtime->GetName(), true, true); } } -void Checkable::TriggerDowntimes(void) +void Checkable::TriggerDowntimes() { for (const Downtime::Ptr& downtime : GetDowntimes()) { downtime->TriggerDowntime(); } } -bool Checkable::IsInDowntime(void) const +bool Checkable::IsInDowntime() const { for (const Downtime::Ptr& downtime : GetDowntimes()) { if (downtime->IsInEffect()) @@ -50,7 +50,7 @@ bool Checkable::IsInDowntime(void) const return false; } -int Checkable::GetDowntimeDepth(void) const +int Checkable::GetDowntimeDepth() const { int downtime_depth = 0; @@ -62,7 +62,7 @@ int Checkable::GetDowntimeDepth(void) const return downtime_depth; } -std::set Checkable::GetDowntimes(void) const +std::set Checkable::GetDowntimes() const { boost::mutex::scoped_lock lock(m_DowntimeMutex); return m_Downtimes; diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp index d0058a252..12fc926ea 100644 --- a/lib/icinga/checkable-event.cpp +++ b/lib/icinga/checkable-event.cpp @@ -29,7 +29,7 @@ using namespace icinga; boost::signals2::signal Checkable::OnEventCommandExecuted; -EventCommand::Ptr Checkable::GetEventCommand(void) const +EventCommand::Ptr Checkable::GetEventCommand() const { return EventCommand::GetByName(GetEventCommandRaw()); } diff --git a/lib/icinga/checkable-flapping.cpp b/lib/icinga/checkable-flapping.cpp index 0556e8b12..544c97678 100644 --- a/lib/icinga/checkable-flapping.cpp +++ b/lib/icinga/checkable-flapping.cpp @@ -62,7 +62,7 @@ void Checkable::UpdateFlappingStatus(bool stateChange) #endif /* _WIN32 */ } -bool Checkable::IsFlapping(void) const +bool Checkable::IsFlapping() const { if (!GetEnableFlapping() || !IcingaApplication::GetInstance()->GetEnableFlapping()) return false; diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp index f4c506e90..021b3f964 100644 --- a/lib/icinga/checkable-notification.cpp +++ b/lib/icinga/checkable-notification.cpp @@ -34,7 +34,7 @@ boost::signals2::signal Checkable::OnNotificationSentToUser; -void Checkable::ResetNotificationNumbers(void) +void Checkable::ResetNotificationNumbers() { for (const Notification::Ptr& notification : GetNotifications()) { ObjectLock olock(notification); @@ -82,7 +82,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr& } } -std::set Checkable::GetNotifications(void) const +std::set Checkable::GetNotifications() const { boost::mutex::scoped_lock lock(m_NotificationMutex); return m_Notifications; diff --git a/lib/icinga/checkable-script.cpp b/lib/icinga/checkable-script.cpp index 33e1d5006..31c7f9eda 100644 --- a/lib/icinga/checkable-script.cpp +++ b/lib/icinga/checkable-script.cpp @@ -33,7 +33,7 @@ static void CheckableProcessCheckResult(const CheckResult::Ptr& cr) self->ProcessCheckResult(cr); } -Object::Ptr Checkable::GetPrototype(void) +Object::Ptr Checkable::GetPrototype() { static Dictionary::Ptr prototype; diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 6ac405b91..8494e2c89 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -33,7 +33,7 @@ INITIALIZE_ONCE(&Checkable::StaticInitialize); boost::signals2::signal Checkable::OnAcknowledgementSet; boost::signals2::signal Checkable::OnAcknowledgementCleared; -void Checkable::StaticInitialize(void) +void Checkable::StaticInitialize() { /* fixed downtime start */ Downtime::OnDowntimeStarted.connect(std::bind(&Checkable::NotifyFixedDowntimeStart, _1)); @@ -43,13 +43,13 @@ void Checkable::StaticInitialize(void) Downtime::OnDowntimeRemoved.connect(std::bind(&Checkable::NotifyDowntimeEnd, _1)); } -Checkable::Checkable(void) +Checkable::Checkable() : m_CheckRunning(false) { SetSchedulingOffset(Utility::Random()); } -void Checkable::OnAllConfigLoaded(void) +void Checkable::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -101,7 +101,7 @@ void Checkable::AddGroup(const String& name) groups->Add(name); } -AcknowledgementType Checkable::GetAcknowledgement(void) +AcknowledgementType Checkable::GetAcknowledgement() { AcknowledgementType avalue = static_cast(GetAcknowledgementRaw()); @@ -117,7 +117,7 @@ AcknowledgementType Checkable::GetAcknowledgement(void) return avalue; } -bool Checkable::IsAcknowledged(void) const +bool Checkable::IsAcknowledged() const { return const_cast(this)->GetAcknowledgement() != AcknowledgementNone; } @@ -141,12 +141,12 @@ void Checkable::ClearAcknowledgement(const MessageOrigin::Ptr& origin) OnAcknowledgementCleared(this, origin); } -Endpoint::Ptr Checkable::GetCommandEndpoint(void) const +Endpoint::Ptr Checkable::GetCommandEndpoint() const { return Endpoint::GetByName(GetCommandEndpointRaw()); } -int Checkable::GetSeverity(void) const +int Checkable::GetSeverity() const { /* overridden in Host/Service class. */ return 0; diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index 7f1a3a991..76dfa8f85 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -84,38 +84,38 @@ public: DECLARE_OBJECT(Checkable); DECLARE_OBJECTNAME(Checkable); - static void StaticInitialize(void); + static void StaticInitialize(); - Checkable(void); + Checkable(); - std::set GetParents(void) const; - std::set GetChildren(void) const; - std::set GetAllChildren(void) const; + std::set GetParents() const; + std::set GetChildren() const; + std::set GetAllChildren() const; void AddGroup(const String& name); bool IsReachable(DependencyType dt = DependencyState, intrusive_ptr *failedDependency = nullptr, int rstack = 0) const; - AcknowledgementType GetAcknowledgement(void); + AcknowledgementType GetAcknowledgement(); void AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify = true, bool persistent = false, double expiry = 0, const MessageOrigin::Ptr& origin = nullptr); void ClearAcknowledgement(const MessageOrigin::Ptr& origin = nullptr); - virtual int GetSeverity(void) const override; + virtual int GetSeverity() const override; /* Checks */ - intrusive_ptr GetCheckCommand(void) const; - TimePeriod::Ptr GetCheckPeriod(void) const; + intrusive_ptr GetCheckCommand() const; + TimePeriod::Ptr GetCheckPeriod() const; - long GetSchedulingOffset(void); + long GetSchedulingOffset(); void SetSchedulingOffset(long offset); void UpdateNextCheck(const MessageOrigin::Ptr& origin = nullptr); - bool HasBeenChecked(void) const; + bool HasBeenChecked() const; virtual bool IsStateOK(ServiceState state) = 0; - virtual double GetLastCheck(void) const override final; + double GetLastCheck(void) const final; virtual void SaveLastState(ServiceState state, double timestamp) = 0; @@ -125,7 +125,7 @@ public: void ExecuteCheck(); void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin = nullptr); - Endpoint::Ptr GetCommandEndpoint(void) const; + Endpoint::Ptr GetCommandEndpoint() const; static boost::signals2::signal OnNewCheckResult; static boost::signals2::signal OnStateChange; @@ -145,64 +145,64 @@ public: static boost::signals2::signal OnEventCommandExecuted; /* Downtimes */ - virtual int GetDowntimeDepth(void) const override final; + int GetDowntimeDepth(void) const final; - void RemoveAllDowntimes(void); - void TriggerDowntimes(void); - bool IsInDowntime(void) const; - bool IsAcknowledged(void) const; + void RemoveAllDowntimes(); + void TriggerDowntimes(); + bool IsInDowntime() const; + bool IsAcknowledged() const; - std::set GetDowntimes(void) const; + std::set GetDowntimes() const; void RegisterDowntime(const Downtime::Ptr& downtime); void UnregisterDowntime(const Downtime::Ptr& downtime); /* Comments */ - void RemoveAllComments(void); + void RemoveAllComments(); void RemoveCommentsByType(int type); - std::set GetComments(void) const; + std::set GetComments() const; void RegisterComment(const Comment::Ptr& comment); void UnregisterComment(const Comment::Ptr& comment); /* Notifications */ void SendNotifications(NotificationType type, const CheckResult::Ptr& cr, const String& author = "", const String& text = ""); - std::set GetNotifications(void) const; + std::set GetNotifications() const; void RegisterNotification(const Notification::Ptr& notification); void UnregisterNotification(const Notification::Ptr& notification); - void ResetNotificationNumbers(void); + void ResetNotificationNumbers(); /* Event Handler */ void ExecuteEventHandler(const Dictionary::Ptr& resolvedMacros = nullptr, bool useResolvedMacros = false); - intrusive_ptr GetEventCommand(void) const; + intrusive_ptr GetEventCommand() const; /* Flapping Detection */ - bool IsFlapping(void) const; + bool IsFlapping() const; /* Dependencies */ void AddDependency(const intrusive_ptr& dep); void RemoveDependency(const intrusive_ptr& dep); - std::vector > GetDependencies(void) const; + std::vector > GetDependencies() const; void AddReverseDependency(const intrusive_ptr& dep); void RemoveReverseDependency(const intrusive_ptr& dep); - std::vector > GetReverseDependencies(void) const; + std::vector > GetReverseDependencies() const; virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override final; virtual void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) override final; - static void IncreasePendingChecks(void); - static void DecreasePendingChecks(void); - static int GetPendingChecks(void); + static void IncreasePendingChecks(); + static void DecreasePendingChecks(); + static int GetPendingChecks(); - static Object::Ptr GetPrototype(void); + static Object::Ptr GetPrototype(); protected: virtual void Start(bool runtimeCreated) override; - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; private: mutable boost::mutex m_CheckableMutex; diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp index 76bf387ab..cbbab12dc 100644 --- a/lib/icinga/checkresult.cpp +++ b/lib/icinga/checkresult.cpp @@ -35,12 +35,12 @@ INITIALIZE_ONCE([]() { ScriptGlobal::Set("HostDown", HostDown); }) -double CheckResult::CalculateExecutionTime(void) const +double CheckResult::CalculateExecutionTime() const { return GetExecutionEnd() - GetExecutionStart(); } -double CheckResult::CalculateLatency(void) const +double CheckResult::CalculateLatency() const { double latency = (GetScheduleEnd() - GetScheduleStart()) - CalculateExecutionTime(); diff --git a/lib/icinga/checkresult.hpp b/lib/icinga/checkresult.hpp index e577d8f57..7ac615fc7 100644 --- a/lib/icinga/checkresult.hpp +++ b/lib/icinga/checkresult.hpp @@ -36,8 +36,8 @@ class CheckResult final : public ObjectImpl public: DECLARE_OBJECT(CheckResult); - double CalculateExecutionTime(void) const; - double CalculateLatency(void) const; + double CalculateExecutionTime() const; + double CalculateLatency() const; }; } diff --git a/lib/icinga/cib.cpp b/lib/icinga/cib.cpp index e238124ee..7da5e3c8d 100644 --- a/lib/icinga/cib.cpp +++ b/lib/icinga/cib.cpp @@ -73,7 +73,7 @@ int CIB::GetPassiveServiceChecksStatistics(long timespan) return m_PassiveServiceChecksStatistics.UpdateAndGetValues(Utility::GetTime(), timespan); } -CheckableCheckStatistics CIB::CalculateHostCheckStats(void) +CheckableCheckStatistics CIB::CalculateHostCheckStats() { double min_latency = -1, max_latency = 0, sum_latency = 0; int count_latency = 0; @@ -134,7 +134,7 @@ CheckableCheckStatistics CIB::CalculateHostCheckStats(void) return ccs; } -CheckableCheckStatistics CIB::CalculateServiceCheckStats(void) +CheckableCheckStatistics CIB::CalculateServiceCheckStats() { double min_latency = -1, max_latency = 0, sum_latency = 0; int count_latency = 0; @@ -195,7 +195,7 @@ CheckableCheckStatistics CIB::CalculateServiceCheckStats(void) return ccs; } -ServiceStatistics CIB::CalculateServiceStats(void) +ServiceStatistics CIB::CalculateServiceStats() { ServiceStatistics ss = {}; @@ -229,7 +229,7 @@ ServiceStatistics CIB::CalculateServiceStats(void) return ss; } -HostStatistics CIB::CalculateHostStats(void) +HostStatistics CIB::CalculateHostStats() { HostStatistics hs = {}; @@ -262,7 +262,7 @@ HostStatistics CIB::CalculateHostStats(void) * 'perfdata' must be a flat dictionary with double values * 'status' dictionary can contain multiple levels of dictionaries */ -std::pair CIB::GetFeatureStats(void) +std::pair CIB::GetFeatureStats() { Dictionary::Ptr status = new Dictionary(); Array::Ptr perfdata = new Array(); diff --git a/lib/icinga/cib.hpp b/lib/icinga/cib.hpp index ff2ad8770..09bcba5e1 100644 --- a/lib/icinga/cib.hpp +++ b/lib/icinga/cib.hpp @@ -80,17 +80,17 @@ public: static void UpdatePassiveServiceChecksStatistics(long tv, int num); static int GetPassiveServiceChecksStatistics(long timespan); - static CheckableCheckStatistics CalculateHostCheckStats(void); - static CheckableCheckStatistics CalculateServiceCheckStats(void); - static HostStatistics CalculateHostStats(void); - static ServiceStatistics CalculateServiceStats(void); + static CheckableCheckStatistics CalculateHostCheckStats(); + static CheckableCheckStatistics CalculateServiceCheckStats(); + static HostStatistics CalculateHostStats(); + static ServiceStatistics CalculateServiceStats(); - static std::pair GetFeatureStats(void); + static std::pair GetFeatureStats(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); private: - CIB(void); + CIB(); static boost::mutex m_Mutex; static RingBuffer m_ActiveHostChecksStatistics; diff --git a/lib/icinga/clusterevents.cpp b/lib/icinga/clusterevents.cpp index 38890c972..2015558dc 100644 --- a/lib/icinga/clusterevents.cpp +++ b/lib/icinga/clusterevents.cpp @@ -51,7 +51,7 @@ REGISTER_APIFUNCTION(SendNotifications, event, &ClusterEvents::SendNotifications REGISTER_APIFUNCTION(NotificationSentUser, event, &ClusterEvents::NotificationSentUserAPIHandler); REGISTER_APIFUNCTION(NotificationSentToAllUsers, event, &ClusterEvents::NotificationSentToAllUsersAPIHandler); -void ClusterEvents::StaticInitialize(void) +void ClusterEvents::StaticInitialize() { Checkable::OnNewCheckResult.connect(&ClusterEvents::CheckResultHandler); Checkable::OnNextCheckChanged.connect(&ClusterEvents::NextCheckChangedHandler); diff --git a/lib/icinga/clusterevents.hpp b/lib/icinga/clusterevents.hpp index 2faf2a4bd..2f474a0d0 100644 --- a/lib/icinga/clusterevents.hpp +++ b/lib/icinga/clusterevents.hpp @@ -35,7 +35,7 @@ namespace icinga class ClusterEvents { public: - static void StaticInitialize(void); + static void StaticInitialize(); static void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin); static Value CheckResultAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp index 47a5b4962..77cc448a7 100644 --- a/lib/icinga/comment.cpp +++ b/lib/icinga/comment.cpp @@ -78,7 +78,7 @@ Dictionary::Ptr CommentNameComposer::ParseName(const String& name) const return result; } -void Comment::OnAllConfigLoaded(void) +void Comment::OnAllConfigLoaded() { ConfigObject::OnAllConfigLoaded(); @@ -130,19 +130,19 @@ void Comment::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -Checkable::Ptr Comment::GetCheckable(void) const +Checkable::Ptr Comment::GetCheckable() const { return static_pointer_cast(m_Checkable); } -bool Comment::IsExpired(void) const +bool Comment::IsExpired() const { double expire_time = GetExpireTime(); return (expire_time != 0 && expire_time < Utility::GetTime()); } -int Comment::GetNextCommentID(void) +int Comment::GetNextCommentID() { boost::mutex::scoped_lock lock(l_CommentMutex); @@ -239,7 +239,7 @@ String Comment::GetCommentIDFromLegacyID(int id) return it->second; } -void Comment::CommentsExpireTimerHandler(void) +void Comment::CommentsExpireTimerHandler() { std::vector comments; diff --git a/lib/icinga/comment.hpp b/lib/icinga/comment.hpp index a0dae3ee7..9a1bc97e7 100644 --- a/lib/icinga/comment.hpp +++ b/lib/icinga/comment.hpp @@ -42,11 +42,11 @@ public: static boost::signals2::signal OnCommentAdded; static boost::signals2::signal OnCommentRemoved; - intrusive_ptr GetCheckable(void) const; + intrusive_ptr GetCheckable() const; - bool IsExpired(void) const; + bool IsExpired() const; - static int GetNextCommentID(void); + static int GetNextCommentID(); static String AddComment(const intrusive_ptr& checkable, CommentType entryType, const String& author, const String& text, bool persistent, double expireTime, @@ -57,14 +57,14 @@ public: static String GetCommentIDFromLegacyID(int id); protected: - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; private: ObjectImpl::Ptr m_Checkable; - static void CommentsExpireTimerHandler(void); + static void CommentsExpireTimerHandler(); }; } diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp index 247226c01..a0a96a0ce 100644 --- a/lib/icinga/compatutility.hpp +++ b/lib/icinga/compatutility.hpp @@ -120,7 +120,7 @@ public: static String UnEscapeString(const String& str); private: - CompatUtility(void); + CompatUtility(); static String GetCommandNamePrefix(const Command::Ptr command); }; diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp index 613682dd4..42c5f4e64 100644 --- a/lib/icinga/dependency.cpp +++ b/lib/icinga/dependency.cpp @@ -67,7 +67,7 @@ Dictionary::Ptr DependencyNameComposer::ParseName(const String& name) const return result; } -void Dependency::OnConfigLoaded(void) +void Dependency::OnConfigLoaded() { Value defaultFilter; @@ -79,7 +79,7 @@ void Dependency::OnConfigLoaded(void) SetStateFilter(FilterArrayToInt(GetStates(), Notification::GetStateFilterMap(), defaultFilter)); } -void Dependency::OnAllConfigLoaded(void) +void Dependency::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -194,17 +194,17 @@ bool Dependency::IsAvailable(DependencyType dt) const return false; } -Checkable::Ptr Dependency::GetChild(void) const +Checkable::Ptr Dependency::GetChild() const { return m_Child; } -Checkable::Ptr Dependency::GetParent(void) const +Checkable::Ptr Dependency::GetParent() const { return m_Parent; } -TimePeriod::Ptr Dependency::GetPeriod(void) const +TimePeriod::Ptr Dependency::GetPeriod() const { return TimePeriod::GetByName(GetPeriodRaw()); } diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp index d5c7c2870..8f9c364a2 100644 --- a/lib/icinga/dependency.hpp +++ b/lib/icinga/dependency.hpp @@ -42,10 +42,10 @@ public: DECLARE_OBJECT(Dependency); DECLARE_OBJECTNAME(Dependency); - intrusive_ptr GetParent(void) const; - intrusive_ptr GetChild(void) const; + intrusive_ptr GetParent() const; + intrusive_ptr GetChild() const; - TimePeriod::Ptr GetPeriod(void) const; + TimePeriod::Ptr GetPeriod() const; bool IsAvailable(DependencyType dt) const; @@ -55,8 +55,8 @@ public: static void EvaluateApplyRules(const intrusive_ptr& service); protected: - virtual void OnConfigLoaded(void) override; - virtual void OnAllConfigLoaded(void) override; + virtual void OnConfigLoaded() override; + virtual void OnAllConfigLoaded() override; virtual void Stop(bool runtimeRemoved) override; private: diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp index 3b266d10f..226c5af91 100644 --- a/lib/icinga/downtime.cpp +++ b/lib/icinga/downtime.cpp @@ -82,7 +82,7 @@ Dictionary::Ptr DowntimeNameComposer::ParseName(const String& name) const return result; } -void Downtime::OnAllConfigLoaded(void) +void Downtime::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -152,12 +152,12 @@ void Downtime::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -Checkable::Ptr Downtime::GetCheckable(void) const +Checkable::Ptr Downtime::GetCheckable() const { return static_pointer_cast(m_Checkable); } -bool Downtime::IsInEffect(void) const +bool Downtime::IsInEffect() const { double now = Utility::GetTime(); @@ -176,7 +176,7 @@ bool Downtime::IsInEffect(void) const return (now < triggerTime + GetDuration()); } -bool Downtime::IsTriggered(void) const +bool Downtime::IsTriggered() const { double now = Utility::GetTime(); @@ -185,7 +185,7 @@ bool Downtime::IsTriggered(void) const return (triggerTime > 0 && triggerTime <= now); } -bool Downtime::IsExpired(void) const +bool Downtime::IsExpired() const { double now = Utility::GetTime(); @@ -203,13 +203,13 @@ bool Downtime::IsExpired(void) const } } -bool Downtime::HasValidConfigOwner(void) const +bool Downtime::HasValidConfigOwner() const { String configOwner = GetConfigOwner(); return configOwner.IsEmpty() || GetObject(configOwner); } -int Downtime::GetNextDowntimeID(void) +int Downtime::GetNextDowntimeID() { boost::mutex::scoped_lock lock(l_DowntimeMutex); @@ -322,7 +322,7 @@ void Downtime::RemoveDowntime(const String& id, bool cancelled, bool expired, co } } -bool Downtime::CanBeTriggered(void) +bool Downtime::CanBeTriggered() { if (IsInEffect() && IsTriggered()) return false; @@ -338,7 +338,7 @@ bool Downtime::CanBeTriggered(void) return true; } -void Downtime::TriggerDowntime(void) +void Downtime::TriggerDowntime() { if (!CanBeTriggered()) return; @@ -378,7 +378,7 @@ String Downtime::GetDowntimeIDFromLegacyID(int id) return it->second; } -void Downtime::DowntimesStartTimerHandler(void) +void Downtime::DowntimesStartTimerHandler() { /* Start fixed downtimes. Flexible downtimes will be triggered on-demand. */ for (const Downtime::Ptr& downtime : ConfigType::GetObjectsByType()) { @@ -394,7 +394,7 @@ void Downtime::DowntimesStartTimerHandler(void) } } -void Downtime::DowntimesExpireTimerHandler(void) +void Downtime::DowntimesExpireTimerHandler() { std::vector downtimes; diff --git a/lib/icinga/downtime.hpp b/lib/icinga/downtime.hpp index 7fa547d02..a07496f78 100644 --- a/lib/icinga/downtime.hpp +++ b/lib/icinga/downtime.hpp @@ -44,14 +44,14 @@ public: static boost::signals2::signal OnDowntimeStarted; static boost::signals2::signal OnDowntimeTriggered; - intrusive_ptr GetCheckable(void) const; + intrusive_ptr GetCheckable() const; - bool IsInEffect(void) const; - bool IsTriggered(void) const; - bool IsExpired(void) const; - bool HasValidConfigOwner(void) const; + bool IsInEffect() const; + bool IsTriggered() const; + bool IsExpired() const; + bool HasValidConfigOwner() const; - static int GetNextDowntimeID(void); + static int GetNextDowntimeID(); static String AddDowntime(const intrusive_ptr& checkable, const String& author, const String& comment, double startTime, double endTime, bool fixed, @@ -61,12 +61,12 @@ public: static void RemoveDowntime(const String& id, bool cancelled, bool expired = false, const MessageOrigin::Ptr& origin = nullptr); - void TriggerDowntime(void); + void TriggerDowntime(); static String GetDowntimeIDFromLegacyID(int id); protected: - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; @@ -76,10 +76,10 @@ protected: private: ObjectImpl::Ptr m_Checkable; - bool CanBeTriggered(void); + bool CanBeTriggered(); - static void DowntimesStartTimerHandler(void); - static void DowntimesExpireTimerHandler(void); + static void DowntimesStartTimerHandler(); + static void DowntimesExpireTimerHandler(); }; } diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index ad9f2f375..6f04da4b8 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -134,7 +134,7 @@ void ExternalCommandProcessor::RegisterCommand(const String& command, const Exte GetCommands()[command] = eci; } -void ExternalCommandProcessor::RegisterCommands(void) +void ExternalCommandProcessor::RegisterCommands() { RegisterCommand("PROCESS_HOST_CHECK_RESULT", &ExternalCommandProcessor::ProcessHostCheckResult, 3); RegisterCommand("PROCESS_SERVICE_CHECK_RESULT", &ExternalCommandProcessor::ProcessServiceCheckResult, 4); @@ -2233,13 +2233,13 @@ void ExternalCommandProcessor::DisableServicegroupSvcNotifications(double, const } } -boost::mutex& ExternalCommandProcessor::GetMutex(void) +boost::mutex& ExternalCommandProcessor::GetMutex() { static boost::mutex mtx; return mtx; } -std::map& ExternalCommandProcessor::GetCommands(void) +std::map& ExternalCommandProcessor::GetCommands() { static std::map commands; return commands; diff --git a/lib/icinga/externalcommandprocessor.hpp b/lib/icinga/externalcommandprocessor.hpp index aa76c6040..5aff98cb2 100644 --- a/lib/icinga/externalcommandprocessor.hpp +++ b/lib/icinga/externalcommandprocessor.hpp @@ -46,7 +46,7 @@ public: static boost::signals2::signal&)> OnNewExternalCommand; private: - ExternalCommandProcessor(void); + ExternalCommandProcessor(); static void ExecuteFromFile(const String& line, std::deque< std::vector >& file_queue); @@ -174,10 +174,10 @@ private: static void ChangeCustomCommandVarInternal(const Command::Ptr& command, const String& name, const Value& value); static void RegisterCommand(const String& command, const ExternalCommandCallback& callback, size_t minArgs = 0, size_t maxArgs = UINT_MAX); - static void RegisterCommands(void); + static void RegisterCommands(); - static boost::mutex& GetMutex(void); - static std::map& GetCommands(void); + static boost::mutex& GetMutex(); + static std::map& GetCommands(); }; diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index a7bee233e..dc0832243 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -33,7 +33,7 @@ using namespace icinga; REGISTER_TYPE(Host); -void Host::OnAllConfigLoaded(void) +void Host::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -99,7 +99,7 @@ void Host::Stop(bool runtimeRemoved) // TODO: unregister slave services/notifications? } -std::vector Host::GetServices(void) const +std::vector Host::GetServices() const { boost::mutex::scoped_lock lock(m_ServicesMutex); @@ -127,7 +127,7 @@ void Host::RemoveService(const Service::Ptr& service) m_Services.erase(service->GetShortName()); } -int Host::GetTotalServices(void) const +int Host::GetTotalServices() const { return GetServices().size(); } @@ -166,23 +166,23 @@ HostState Host::CalculateState(ServiceState state) } } -HostState Host::GetState(void) const +HostState Host::GetState() const { return CalculateState(GetStateRaw()); } -HostState Host::GetLastState(void) const +HostState Host::GetLastState() const { return CalculateState(GetLastStateRaw()); } -HostState Host::GetLastHardState(void) const +HostState Host::GetLastHardState() const { return CalculateState(GetLastHardStateRaw()); } /* keep in sync with Service::GetSeverity() */ -int Host::GetSeverity(void) const +int Host::GetSeverity() const { int severity = 0; diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp index 564839683..e3a5ac7af 100644 --- a/lib/icinga/host.hpp +++ b/lib/icinga/host.hpp @@ -43,18 +43,18 @@ public: intrusive_ptr GetServiceByShortName(const Value& name); - std::vector > GetServices(void) const; + std::vector > GetServices() const; void AddService(const intrusive_ptr& service); void RemoveService(const intrusive_ptr& service); - int GetTotalServices(void) const; + int GetTotalServices() const; static HostState CalculateState(ServiceState state); - virtual HostState GetState(void) const override; - virtual HostState GetLastState(void) const override; - virtual HostState GetLastHardState(void) const override; - virtual int GetSeverity(void) const override; + virtual HostState GetState() const override; + virtual HostState GetLastState() const override; + virtual HostState GetLastHardState() const override; + virtual int GetSeverity() const override; virtual bool IsStateOK(ServiceState state) override; virtual void SaveLastState(ServiceState state, double timestamp) override; @@ -70,14 +70,14 @@ public: protected: virtual void Stop(bool runtimeRemoved) override; - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; virtual void CreateChildObjects(const Type::Ptr& childType) override; private: mutable boost::mutex m_ServicesMutex; std::map > m_Services; - static void RefreshServicesCache(void); + static void RefreshServicesCache(); }; } diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp index 1d386396f..e1419530a 100644 --- a/lib/icinga/hostgroup.cpp +++ b/lib/icinga/hostgroup.cpp @@ -71,7 +71,7 @@ void HostGroup::EvaluateObjectRules(const Host::Ptr& host) } } -std::set HostGroup::GetMembers(void) const +std::set HostGroup::GetMembers() const { boost::mutex::scoped_lock lock(m_HostGroupMutex); return m_Members; diff --git a/lib/icinga/hostgroup.hpp b/lib/icinga/hostgroup.hpp index c18aa86fc..146b9fa4a 100644 --- a/lib/icinga/hostgroup.hpp +++ b/lib/icinga/hostgroup.hpp @@ -40,7 +40,7 @@ public: DECLARE_OBJECT(HostGroup); DECLARE_OBJECTNAME(HostGroup); - std::set GetMembers(void) const; + std::set GetMembers() const; void AddMember(const Host::Ptr& host); void RemoveMember(const Host::Ptr& host); diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp index 6e011175c..3008bfb96 100644 --- a/lib/icinga/icingaapplication.cpp +++ b/lib/icinga/icingaapplication.cpp @@ -42,7 +42,7 @@ static Timer::Ptr l_RetentionTimer; REGISTER_TYPE(IcingaApplication); INITIALIZE_ONCE(&IcingaApplication::StaticInitialize); -void IcingaApplication::StaticInitialize(void) +void IcingaApplication::StaticInitialize() { String node_name = Utility::GetFQDN(); @@ -91,7 +91,7 @@ void IcingaApplication::StatsFunc(const Dictionary::Ptr& status, const Array::Pt * * @returns An exit status. */ -int IcingaApplication::Main(void) +int IcingaApplication::Main() { Log(LogDebug, "IcingaApplication", "In IcingaApplication::Main()"); @@ -108,7 +108,7 @@ int IcingaApplication::Main(void) return EXIT_SUCCESS; } -void IcingaApplication::OnShutdown(void) +void IcingaApplication::OnShutdown() { { ObjectLock olock(this); @@ -149,13 +149,13 @@ static void PersistModAttrHelper(std::fstream& fp, ConfigObject::Ptr& previousOb previousObject = object; } -void IcingaApplication::DumpProgramState(void) +void IcingaApplication::DumpProgramState() { ConfigObject::DumpObjects(GetStatePath()); DumpModifiedAttributes(); } -void IcingaApplication::DumpModifiedAttributes(void) +void IcingaApplication::DumpModifiedAttributes() { String path = GetModAttrPath(); @@ -186,7 +186,7 @@ void IcingaApplication::DumpModifiedAttributes(void) } } -IcingaApplication::Ptr IcingaApplication::GetInstance(void) +IcingaApplication::Ptr IcingaApplication::GetInstance() { return static_pointer_cast(Application::GetInstance()); } @@ -284,7 +284,7 @@ bool IcingaApplication::ResolveMacro(const String& macro, const CheckResult::Ptr return false; } -String IcingaApplication::GetNodeName(void) const +String IcingaApplication::GetNodeName() const { return ScriptGlobal::Get("NodeName"); } diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp index e67ca1f71..fc8e0c624 100644 --- a/lib/icinga/icingaapplication.hpp +++ b/lib/icinga/icingaapplication.hpp @@ -38,27 +38,27 @@ public: DECLARE_OBJECT(IcingaApplication); DECLARE_OBJECTNAME(IcingaApplication); - static void StaticInitialize(void); + static void StaticInitialize(); - virtual int Main(void) override; + virtual int Main() override; static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - static IcingaApplication::Ptr GetInstance(void); + static IcingaApplication::Ptr GetInstance(); - String GetPidPath(void) const; + String GetPidPath() const; virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; - String GetNodeName(void) const; + String GetNodeName() const; virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override; private: - void DumpProgramState(void); - void DumpModifiedAttributes(void); + void DumpProgramState(); + void DumpModifiedAttributes(); - virtual void OnShutdown(void) override; + virtual void OnShutdown() override; }; } diff --git a/lib/icinga/legacytimeperiod.hpp b/lib/icinga/legacytimeperiod.hpp index 249106dbc..9bec5b68c 100644 --- a/lib/icinga/legacytimeperiod.hpp +++ b/lib/icinga/legacytimeperiod.hpp @@ -50,7 +50,7 @@ public: static Dictionary::Ptr FindNextSegment(const String& daydef, const String& timeranges, tm *reference); private: - LegacyTimePeriod(void); + LegacyTimePeriod(); }; } diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 904b75672..14c5e6000 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -429,7 +429,7 @@ struct CommandArgument String Key; Value AValue; - CommandArgument(void) + CommandArgument() : Order(0), SkipKey(false), RepeatKey(true), SkipValue(false) { } diff --git a/lib/icinga/macroprocessor.hpp b/lib/icinga/macroprocessor.hpp index ed214a393..c7b3b5b36 100644 --- a/lib/icinga/macroprocessor.hpp +++ b/lib/icinga/macroprocessor.hpp @@ -54,7 +54,7 @@ public: static void ValidateCustomVars(const ConfigObject::Ptr& object, const Dictionary::Ptr& value); private: - MacroProcessor(void); + MacroProcessor(); static bool ResolveMacro(const String& macro, const ResolverList& resolvers, const CheckResult::Ptr& cr, Value *result, bool *recursive_macro); diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index 3de5c4aba..f85c90a43 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -80,7 +80,7 @@ Dictionary::Ptr NotificationNameComposer::ParseName(const String& name) const return result; } -void Notification::StaticInitialize(void) +void Notification::StaticInitialize() { ScriptGlobal::Set("OK", "OK"); ScriptGlobal::Set("Warning", "Warning"); @@ -117,7 +117,7 @@ void Notification::StaticInitialize(void) m_TypeFilterMap["FlappingEnd"] = NotificationFlappingEnd; } -void Notification::OnConfigLoaded(void) +void Notification::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -125,7 +125,7 @@ void Notification::OnConfigLoaded(void) SetStateFilter(FilterArrayToInt(GetStates(), GetStateFilterMap(), ~0)); } -void Notification::OnAllConfigLoaded(void) +void Notification::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -165,17 +165,17 @@ void Notification::Stop(bool runtimeRemoved) obj->UnregisterNotification(this); } -Checkable::Ptr Notification::GetCheckable(void) const +Checkable::Ptr Notification::GetCheckable() const { return static_pointer_cast(m_Checkable); } -NotificationCommand::Ptr Notification::GetCommand(void) const +NotificationCommand::Ptr Notification::GetCommand() const { return NotificationCommand::GetByName(GetCommandRaw()); } -std::set Notification::GetUsers(void) const +std::set Notification::GetUsers() const { std::set result; @@ -197,7 +197,7 @@ std::set Notification::GetUsers(void) const return result; } -std::set Notification::GetUserGroups(void) const +std::set Notification::GetUserGroups() const { std::set result; @@ -219,17 +219,17 @@ std::set Notification::GetUserGroups(void) const return result; } -TimePeriod::Ptr Notification::GetPeriod(void) const +TimePeriod::Ptr Notification::GetPeriod() const { return TimePeriod::GetByName(GetPeriodRaw()); } -void Notification::UpdateNotificationNumber(void) +void Notification::UpdateNotificationNumber() { SetNotificationNumber(GetNotificationNumber() + 1); } -void Notification::ResetNotificationNumber(void) +void Notification::ResetNotificationNumber() { SetNotificationNumber(0); } @@ -667,17 +667,17 @@ void Notification::ValidateTypes(const Array::Ptr& value, const ValidationUtils& BOOST_THROW_EXCEPTION(ValidationError(this, { "types" }, "Type filter is invalid.")); } -Endpoint::Ptr Notification::GetCommandEndpoint(void) const +Endpoint::Ptr Notification::GetCommandEndpoint() const { return Endpoint::GetByName(GetCommandEndpointRaw()); } -const std::map& Notification::GetStateFilterMap(void) +const std::map& Notification::GetStateFilterMap() { return m_StateFilterMap; } -const std::map& Notification::GetTypeFilterMap(void) +const std::map& Notification::GetTypeFilterMap() { return m_TypeFilterMap; } diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp index 567ebc55d..3e4668f26 100644 --- a/lib/icinga/notification.hpp +++ b/lib/icinga/notification.hpp @@ -83,21 +83,21 @@ public: DECLARE_OBJECT(Notification); DECLARE_OBJECTNAME(Notification); - static void StaticInitialize(void); + static void StaticInitialize(); - intrusive_ptr GetCheckable(void) const; - intrusive_ptr GetCommand(void) const; - TimePeriod::Ptr GetPeriod(void) const; - std::set GetUsers(void) const; - std::set GetUserGroups(void) const; + intrusive_ptr GetCheckable() const; + intrusive_ptr GetCommand() const; + TimePeriod::Ptr GetPeriod() const; + std::set GetUsers() const; + std::set GetUserGroups() const; - void UpdateNotificationNumber(void); - void ResetNotificationNumber(void); + void UpdateNotificationNumber(); + void ResetNotificationNumber(); void BeginExecuteNotification(NotificationType type, const CheckResult::Ptr& cr, bool force, bool reminder = false, const String& author = "", const String& text = ""); - Endpoint::Ptr GetCommandEndpoint(void) const; + Endpoint::Ptr GetCommandEndpoint() const; static String NotificationTypeToString(NotificationType type); static String NotificationFilterToString(int filter, const std::map& filterMap); @@ -112,12 +112,12 @@ public: static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); - static const std::map& GetStateFilterMap(void); - static const std::map& GetTypeFilterMap(void); + static const std::map& GetStateFilterMap(); + static const std::map& GetTypeFilterMap(); protected: - virtual void OnConfigLoaded(void) override; - virtual void OnAllConfigLoaded(void) override; + virtual void OnConfigLoaded() override; + virtual void OnAllConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; diff --git a/lib/icinga/objectutils.hpp b/lib/icinga/objectutils.hpp index e31ae9f5e..60a77646f 100644 --- a/lib/icinga/objectutils.hpp +++ b/lib/icinga/objectutils.hpp @@ -38,7 +38,7 @@ public: static Array::Ptr GetServices(const Value& host); private: - ObjectUtils(void); + ObjectUtils(); }; } diff --git a/lib/icinga/pluginutility.hpp b/lib/icinga/pluginutility.hpp index e3995f964..756ad9d97 100644 --- a/lib/icinga/pluginutility.hpp +++ b/lib/icinga/pluginutility.hpp @@ -51,7 +51,7 @@ public: static String FormatPerfdata(const Array::Ptr& perfdata); private: - PluginUtility(void); + PluginUtility(); }; } diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp index 0740a2a87..b19480964 100644 --- a/lib/icinga/scheduleddowntime.cpp +++ b/lib/icinga/scheduleddowntime.cpp @@ -77,7 +77,7 @@ Dictionary::Ptr ScheduledDowntimeNameComposer::ParseName(const String& name) con return result; } -void ScheduledDowntime::OnAllConfigLoaded(void) +void ScheduledDowntime::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -101,7 +101,7 @@ void ScheduledDowntime::Start(bool runtimeCreated) Utility::QueueAsyncCallback(std::bind(&ScheduledDowntime::CreateNextDowntime, this)); } -void ScheduledDowntime::TimerProc(void) +void ScheduledDowntime::TimerProc() { for (const ScheduledDowntime::Ptr& sd : ConfigType::GetObjectsByType()) { if (sd->IsActive()) @@ -109,7 +109,7 @@ void ScheduledDowntime::TimerProc(void) } } -Checkable::Ptr ScheduledDowntime::GetCheckable(void) const +Checkable::Ptr ScheduledDowntime::GetCheckable() const { Host::Ptr host = Host::GetByName(GetHostName()); @@ -119,7 +119,7 @@ Checkable::Ptr ScheduledDowntime::GetCheckable(void) const return host->GetServiceByShortName(GetServiceName()); } -std::pair ScheduledDowntime::FindNextSegment(void) +std::pair ScheduledDowntime::FindNextSegment() { time_t refts = Utility::GetTime(); tm reference = Utility::LocalTime(refts); @@ -168,7 +168,7 @@ std::pair ScheduledDowntime::FindNextSegment(void) return std::make_pair(0, 0); } -void ScheduledDowntime::CreateNextDowntime(void) +void ScheduledDowntime::CreateNextDowntime() { for (const Downtime::Ptr& downtime : GetCheckable()->GetDowntimes()) { if (downtime->GetScheduledBy() != GetName() || diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp index 0c1883c95..125c8da9f 100644 --- a/lib/icinga/scheduleddowntime.hpp +++ b/lib/icinga/scheduleddowntime.hpp @@ -44,7 +44,7 @@ public: DECLARE_OBJECT(ScheduledDowntime); DECLARE_OBJECTNAME(ScheduledDowntime); - Checkable::Ptr GetCheckable(void) const; + Checkable::Ptr GetCheckable() const; static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); @@ -52,14 +52,14 @@ public: virtual void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; virtual void Start(bool runtimeCreated) override; private: - static void TimerProc(void); + static void TimerProc(); - std::pair FindNextSegment(void); - void CreateNextDowntime(void); + std::pair FindNextSegment(); + void CreateNextDowntime(); static bool EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule); static bool EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyRule& rule); diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index e720646d3..3964b3686 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -57,7 +57,7 @@ Dictionary::Ptr ServiceNameComposer::ParseName(const String& name) const return result; } -void Service::OnAllConfigLoaded(void) +void Service::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -119,13 +119,13 @@ Service::Ptr Service::GetByNamePair(const String& hostName, const String& servic } } -Host::Ptr Service::GetHost(void) const +Host::Ptr Service::GetHost() const { return m_Host; } /* keep in sync with Host::GetSeverity() */ -int Service::GetSeverity(void) const +int Service::GetSeverity() const { int severity = 0; diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp index 8e7bb69c0..0044e48cf 100644 --- a/lib/icinga/service.hpp +++ b/lib/icinga/service.hpp @@ -45,8 +45,8 @@ public: static Service::Ptr GetByNamePair(const String& hostName, const String& serviceName); - virtual Host::Ptr GetHost(void) const override; - virtual int GetSeverity(void) const override; + virtual Host::Ptr GetHost() const override; + virtual int GetSeverity() const override; virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; @@ -62,7 +62,7 @@ public: static void EvaluateApplyRules(const Host::Ptr& host); protected: - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; virtual void CreateChildObjects(const Type::Ptr& childType) override; private: diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp index 5b2b43aac..879e5156c 100644 --- a/lib/icinga/servicegroup.cpp +++ b/lib/icinga/servicegroup.cpp @@ -74,7 +74,7 @@ void ServiceGroup::EvaluateObjectRules(const Service::Ptr& service) } } -std::set ServiceGroup::GetMembers(void) const +std::set ServiceGroup::GetMembers() const { boost::mutex::scoped_lock lock(m_ServiceGroupMutex); return m_Members; diff --git a/lib/icinga/servicegroup.hpp b/lib/icinga/servicegroup.hpp index a99d65bc0..dc87028c2 100644 --- a/lib/icinga/servicegroup.hpp +++ b/lib/icinga/servicegroup.hpp @@ -40,7 +40,7 @@ public: DECLARE_OBJECT(ServiceGroup); DECLARE_OBJECTNAME(ServiceGroup); - std::set GetMembers(void) const; + std::set GetMembers() const; void AddMember(const Service::Ptr& service); void RemoveMember(const Service::Ptr& service); diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp index 99205745a..626d03f98 100644 --- a/lib/icinga/timeperiod.cpp +++ b/lib/icinga/timeperiod.cpp @@ -287,7 +287,7 @@ void TimePeriod::UpdateRegion(double begin, double end, bool clearExisting) } } -bool TimePeriod::GetIsInside(void) const +bool TimePeriod::GetIsInside() const { return IsInside(Utility::GetTime()); } @@ -334,7 +334,7 @@ double TimePeriod::FindNextTransition(double begin) return closestTransition; } -void TimePeriod::UpdateTimerHandler(void) +void TimePeriod::UpdateTimerHandler() { double now = Utility::GetTime(); @@ -358,7 +358,7 @@ void TimePeriod::UpdateTimerHandler(void) } } -void TimePeriod::Dump(void) +void TimePeriod::Dump() { Array::Ptr segments = GetSegments(); diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp index 38be76265..c8a7bbe42 100644 --- a/lib/icinga/timeperiod.hpp +++ b/lib/icinga/timeperiod.hpp @@ -41,7 +41,7 @@ public: void UpdateRegion(double begin, double end, bool clearExisting); - virtual bool GetIsInside(void) const override; + virtual bool GetIsInside() const override; bool IsInside(double ts) const; double FindNextTransition(double begin); @@ -57,9 +57,9 @@ private: void Merge(const TimePeriod::Ptr& timeperiod, bool include = true); - void Dump(void); + void Dump(); - static void UpdateTimerHandler(void); + static void UpdateTimerHandler(); }; } diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp index 282593c3e..b7e92b03d 100644 --- a/lib/icinga/user.cpp +++ b/lib/icinga/user.cpp @@ -29,7 +29,7 @@ using namespace icinga; REGISTER_TYPE(User); -void User::OnConfigLoaded(void) +void User::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -37,7 +37,7 @@ void User::OnConfigLoaded(void) SetStateFilter(FilterArrayToInt(GetStates(), Notification::GetStateFilterMap(), ~0)); } -void User::OnAllConfigLoaded(void) +void User::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -92,7 +92,7 @@ void User::AddGroup(const String& name) groups->Add(name); } -TimePeriod::Ptr User::GetPeriod(void) const +TimePeriod::Ptr User::GetPeriod() const { return TimePeriod::GetByName(GetPeriodRaw()); } diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp index 12c3a6cc2..699f66a57 100644 --- a/lib/icinga/user.hpp +++ b/lib/icinga/user.hpp @@ -42,7 +42,7 @@ public: void AddGroup(const String& name); /* Notifications */ - TimePeriod::Ptr GetPeriod(void) const; + TimePeriod::Ptr GetPeriod() const; virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; @@ -50,8 +50,8 @@ public: protected: virtual void Stop(bool runtimeRemoved) override; - virtual void OnConfigLoaded(void) override; - virtual void OnAllConfigLoaded(void) override; + virtual void OnConfigLoaded() override; + virtual void OnAllConfigLoaded() override; private: mutable boost::mutex m_UserMutex; }; diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp index e1740e35a..4741ed024 100644 --- a/lib/icinga/usergroup.cpp +++ b/lib/icinga/usergroup.cpp @@ -71,7 +71,7 @@ void UserGroup::EvaluateObjectRules(const User::Ptr& user) } } -std::set UserGroup::GetMembers(void) const +std::set UserGroup::GetMembers() const { boost::mutex::scoped_lock lock(m_UserGroupMutex); return m_Members; diff --git a/lib/icinga/usergroup.hpp b/lib/icinga/usergroup.hpp index 0620c0059..a212ab3d3 100644 --- a/lib/icinga/usergroup.hpp +++ b/lib/icinga/usergroup.hpp @@ -40,7 +40,7 @@ public: DECLARE_OBJECT(UserGroup); DECLARE_OBJECTNAME(UserGroup); - std::set GetMembers(void) const; + std::set GetMembers() const; void AddMember(const User::Ptr& user); void RemoveMember(const User::Ptr& user); diff --git a/lib/livestatus/aggregator.cpp b/lib/livestatus/aggregator.cpp index 72fed730f..16aaadcda 100644 --- a/lib/livestatus/aggregator.cpp +++ b/lib/livestatus/aggregator.cpp @@ -21,7 +21,7 @@ using namespace icinga; -Aggregator::Aggregator(void) +Aggregator::Aggregator() { } void Aggregator::SetFilter(const Filter::Ptr& filter) @@ -29,10 +29,10 @@ void Aggregator::SetFilter(const Filter::Ptr& filter) m_Filter = filter; } -Filter::Ptr Aggregator::GetFilter(void) const +Filter::Ptr Aggregator::GetFilter() const { return m_Filter; } -AggregatorState::~AggregatorState(void) +AggregatorState::~AggregatorState() { } diff --git a/lib/livestatus/aggregator.hpp b/lib/livestatus/aggregator.hpp index 242c795a6..f37b0e566 100644 --- a/lib/livestatus/aggregator.hpp +++ b/lib/livestatus/aggregator.hpp @@ -32,7 +32,7 @@ namespace icinga */ struct AggregatorState { - virtual ~AggregatorState(void); + virtual ~AggregatorState(); }; /** @@ -48,9 +48,9 @@ public: void SetFilter(const Filter::Ptr& filter); protected: - Aggregator(void); + Aggregator(); - Filter::Ptr GetFilter(void) const; + Filter::Ptr GetFilter() const; private: Filter::Ptr m_Filter; diff --git a/lib/livestatus/andfilter.cpp b/lib/livestatus/andfilter.cpp index 7a5771c9d..4b73eedc6 100644 --- a/lib/livestatus/andfilter.cpp +++ b/lib/livestatus/andfilter.cpp @@ -21,7 +21,7 @@ using namespace icinga; -AndFilter::AndFilter(void) +AndFilter::AndFilter() { } bool AndFilter::Apply(const Table::Ptr& table, const Value& row) diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp index 1a212d6da..abf1bc51f 100644 --- a/lib/livestatus/andfilter.hpp +++ b/lib/livestatus/andfilter.hpp @@ -35,7 +35,7 @@ class AndFilter final : public CombinerFilter public: DECLARE_PTR_TYPEDEFS(AndFilter); - AndFilter(void); + AndFilter(); virtual bool Apply(const Table::Ptr& table, const Value& row) override; }; diff --git a/lib/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp index 67d5303d9..eec57e392 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct AvgAggregatorState final : public AggregatorState { - AvgAggregatorState(void) + AvgAggregatorState() : Avg(0), AvgCount(0) { } diff --git a/lib/livestatus/combinerfilter.cpp b/lib/livestatus/combinerfilter.cpp index 335310a8a..5a4ca1414 100644 --- a/lib/livestatus/combinerfilter.cpp +++ b/lib/livestatus/combinerfilter.cpp @@ -21,7 +21,7 @@ using namespace icinga; -CombinerFilter::CombinerFilter(void) +CombinerFilter::CombinerFilter() { } void CombinerFilter::AddSubFilter(const Filter::Ptr& filter) diff --git a/lib/livestatus/combinerfilter.hpp b/lib/livestatus/combinerfilter.hpp index b30158159..63e614e84 100644 --- a/lib/livestatus/combinerfilter.hpp +++ b/lib/livestatus/combinerfilter.hpp @@ -40,7 +40,7 @@ public: protected: std::vector m_Filters; - CombinerFilter(void); + CombinerFilter(); }; } diff --git a/lib/livestatus/commandstable.cpp b/lib/livestatus/commandstable.cpp index 3f7db657c..6526486b1 100644 --- a/lib/livestatus/commandstable.cpp +++ b/lib/livestatus/commandstable.cpp @@ -30,7 +30,7 @@ using namespace icinga; -CommandsTable::CommandsTable(void) +CommandsTable::CommandsTable() { AddColumns(this); } @@ -47,12 +47,12 @@ void CommandsTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "modified_attributes_list", Column(&Table::ZeroAccessor, objectAccessor)); } -String CommandsTable::GetName(void) const +String CommandsTable::GetName() const { return "commands"; } -String CommandsTable::GetPrefix(void) const +String CommandsTable::GetPrefix() const { return "command"; } diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp index 8e18c0ef7..b06033dc1 100644 --- a/lib/livestatus/commandstable.hpp +++ b/lib/livestatus/commandstable.hpp @@ -35,13 +35,13 @@ class CommandsTable final : public Table public: DECLARE_PTR_TYPEDEFS(CommandsTable); - CommandsTable(void); + CommandsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/commentstable.cpp b/lib/livestatus/commentstable.cpp index eb7f21682..ca75eb259 100644 --- a/lib/livestatus/commentstable.cpp +++ b/lib/livestatus/commentstable.cpp @@ -27,7 +27,7 @@ using namespace icinga; -CommentsTable::CommentsTable(void) +CommentsTable::CommentsTable() { AddColumns(this); } @@ -52,12 +52,12 @@ void CommentsTable::AddColumns(Table *table, const String& prefix, HostsTable::AddColumns(table, "host_", std::bind(&CommentsTable::HostAccessor, _1, objectAccessor)); } -String CommentsTable::GetName(void) const +String CommentsTable::GetName() const { return "comments"; } -String CommentsTable::GetPrefix(void) const +String CommentsTable::GetPrefix() const { return "comment"; } diff --git a/lib/livestatus/commentstable.hpp b/lib/livestatus/commentstable.hpp index 6b53e1235..4de5e2c8a 100644 --- a/lib/livestatus/commentstable.hpp +++ b/lib/livestatus/commentstable.hpp @@ -35,13 +35,13 @@ class CommentsTable final : public Table public: DECLARE_PTR_TYPEDEFS(CommentsTable); - CommentsTable(void); + CommentsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/contactgroupstable.cpp b/lib/livestatus/contactgroupstable.cpp index 3ef1d0c3c..93587674a 100644 --- a/lib/livestatus/contactgroupstable.cpp +++ b/lib/livestatus/contactgroupstable.cpp @@ -23,7 +23,7 @@ using namespace icinga; -ContactGroupsTable::ContactGroupsTable(void) +ContactGroupsTable::ContactGroupsTable() { AddColumns(this); } @@ -36,12 +36,12 @@ void ContactGroupsTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "members", Column(&ContactGroupsTable::MembersAccessor, objectAccessor)); } -String ContactGroupsTable::GetName(void) const +String ContactGroupsTable::GetName() const { return "contactgroups"; } -String ContactGroupsTable::GetPrefix(void) const +String ContactGroupsTable::GetPrefix() const { return "contactgroup"; } diff --git a/lib/livestatus/contactgroupstable.hpp b/lib/livestatus/contactgroupstable.hpp index c4010c94b..e0eed78e0 100644 --- a/lib/livestatus/contactgroupstable.hpp +++ b/lib/livestatus/contactgroupstable.hpp @@ -35,13 +35,13 @@ class ContactGroupsTable final : public Table public: DECLARE_PTR_TYPEDEFS(ContactGroupsTable); - ContactGroupsTable(void); + ContactGroupsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/contactstable.cpp b/lib/livestatus/contactstable.cpp index 4a8619a52..fe725bc3c 100644 --- a/lib/livestatus/contactstable.cpp +++ b/lib/livestatus/contactstable.cpp @@ -29,7 +29,7 @@ using namespace icinga; -ContactsTable::ContactsTable(void) +ContactsTable::ContactsTable() { AddColumns(this); } @@ -57,12 +57,12 @@ void ContactsTable::AddColumns(Table *table, const String& prefix, } -String ContactsTable::GetName(void) const +String ContactsTable::GetName() const { return "contacts"; } -String ContactsTable::GetPrefix(void) const +String ContactsTable::GetPrefix() const { return "contact"; } diff --git a/lib/livestatus/contactstable.hpp b/lib/livestatus/contactstable.hpp index 04387201b..e42c9c023 100644 --- a/lib/livestatus/contactstable.hpp +++ b/lib/livestatus/contactstable.hpp @@ -35,13 +35,13 @@ class ContactsTable final : public Table public: DECLARE_PTR_TYPEDEFS(ContactsTable); - ContactsTable(void); + ContactsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/countaggregator.hpp b/lib/livestatus/countaggregator.hpp index 1dc6cc93e..3b2bac401 100644 --- a/lib/livestatus/countaggregator.hpp +++ b/lib/livestatus/countaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct CountAggregatorState final : public AggregatorState { - CountAggregatorState(void) + CountAggregatorState() : Count(0) { } diff --git a/lib/livestatus/downtimestable.cpp b/lib/livestatus/downtimestable.cpp index dd2c3db33..008a391ac 100644 --- a/lib/livestatus/downtimestable.cpp +++ b/lib/livestatus/downtimestable.cpp @@ -27,7 +27,7 @@ using namespace icinga; -DowntimesTable::DowntimesTable(void) +DowntimesTable::DowntimesTable() { AddColumns(this); } @@ -52,12 +52,12 @@ void DowntimesTable::AddColumns(Table *table, const String& prefix, HostsTable::AddColumns(table, "host_", std::bind(&DowntimesTable::HostAccessor, _1, objectAccessor)); } -String DowntimesTable::GetName(void) const +String DowntimesTable::GetName() const { return "downtimes"; } -String DowntimesTable::GetPrefix(void) const +String DowntimesTable::GetPrefix() const { return "downtime"; } diff --git a/lib/livestatus/downtimestable.hpp b/lib/livestatus/downtimestable.hpp index 22f716400..b9e4d3d4d 100644 --- a/lib/livestatus/downtimestable.hpp +++ b/lib/livestatus/downtimestable.hpp @@ -35,13 +35,13 @@ class DowntimesTable final : public Table public: DECLARE_PTR_TYPEDEFS(DowntimesTable); - DowntimesTable(void); + DowntimesTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/endpointstable.cpp b/lib/livestatus/endpointstable.cpp index 4ac582cb6..89443ef34 100644 --- a/lib/livestatus/endpointstable.cpp +++ b/lib/livestatus/endpointstable.cpp @@ -34,7 +34,7 @@ using namespace icinga; -EndpointsTable::EndpointsTable(void) +EndpointsTable::EndpointsTable() { AddColumns(this); } @@ -49,12 +49,12 @@ void EndpointsTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "zone", Column(&EndpointsTable::ZoneAccessor, objectAccessor)); } -String EndpointsTable::GetName(void) const +String EndpointsTable::GetName() const { return "endpoints"; } -String EndpointsTable::GetPrefix(void) const +String EndpointsTable::GetPrefix() const { return "endpoint"; } diff --git a/lib/livestatus/endpointstable.hpp b/lib/livestatus/endpointstable.hpp index a04fd9de7..c42634207 100644 --- a/lib/livestatus/endpointstable.hpp +++ b/lib/livestatus/endpointstable.hpp @@ -35,13 +35,13 @@ class EndpointsTable final : public Table public: DECLARE_PTR_TYPEDEFS(EndpointsTable); - EndpointsTable(void); + EndpointsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/filter.hpp b/lib/livestatus/filter.hpp index 629ca392a..71270e741 100644 --- a/lib/livestatus/filter.hpp +++ b/lib/livestatus/filter.hpp @@ -35,6 +35,9 @@ public: DECLARE_PTR_TYPEDEFS(Filter); virtual bool Apply(const Table::Ptr& table, const Value& row) = 0; + +protected: + Filter(); }; } diff --git a/lib/livestatus/hostgroupstable.cpp b/lib/livestatus/hostgroupstable.cpp index fcdb36a47..117a84a7d 100644 --- a/lib/livestatus/hostgroupstable.cpp +++ b/lib/livestatus/hostgroupstable.cpp @@ -25,7 +25,7 @@ using namespace icinga; -HostGroupsTable::HostGroupsTable(void) +HostGroupsTable::HostGroupsTable() { AddColumns(this); } @@ -60,12 +60,12 @@ void HostGroupsTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "num_services_hard_unknown", Column(&HostGroupsTable::NumServicesHardUnknownAccessor, objectAccessor)); } -String HostGroupsTable::GetName(void) const +String HostGroupsTable::GetName() const { return "hostgroups"; } -String HostGroupsTable::GetPrefix(void) const +String HostGroupsTable::GetPrefix() const { return "hostgroup"; } diff --git a/lib/livestatus/hostgroupstable.hpp b/lib/livestatus/hostgroupstable.hpp index 16875119c..1b0e7182b 100644 --- a/lib/livestatus/hostgroupstable.hpp +++ b/lib/livestatus/hostgroupstable.hpp @@ -35,13 +35,13 @@ class HostGroupsTable final : public Table public: DECLARE_PTR_TYPEDEFS(HostGroupsTable); - HostGroupsTable(void); + HostGroupsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/hoststable.cpp b/lib/livestatus/hoststable.cpp index 3f0faf2ae..a3c99d123 100644 --- a/lib/livestatus/hoststable.cpp +++ b/lib/livestatus/hoststable.cpp @@ -174,12 +174,12 @@ void HostsTable::AddColumns(Table *table, const String& prefix, } } -String HostsTable::GetName(void) const +String HostsTable::GetName() const { return "hosts"; } -String HostsTable::GetPrefix(void) const +String HostsTable::GetPrefix() const { return "host"; } diff --git a/lib/livestatus/hoststable.hpp b/lib/livestatus/hoststable.hpp index 080fc451b..8653c9b96 100644 --- a/lib/livestatus/hoststable.hpp +++ b/lib/livestatus/hoststable.hpp @@ -40,8 +40,8 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp index 7154de65b..c471de5cd 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct InvAvgAggregatorState final : public AggregatorState { - InvAvgAggregatorState(void) + InvAvgAggregatorState() : InvAvg(0), InvAvgCount(0) { } diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index 8528c25a3..1ddc1fc8d 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct InvSumAggregatorState final : public AggregatorState { - InvSumAggregatorState(void) + InvSumAggregatorState() : InvSum(0) { } diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp index 89e38c5b0..6a5b86418 100644 --- a/lib/livestatus/livestatuslistener.cpp +++ b/lib/livestatus/livestatuslistener.cpp @@ -135,21 +135,21 @@ void LivestatusListener::Stop(bool runtimeRemoved) m_Thread.join(); } -int LivestatusListener::GetClientsConnected(void) +int LivestatusListener::GetClientsConnected() { boost::mutex::scoped_lock lock(l_ComponentMutex); return l_ClientsConnected; } -int LivestatusListener::GetConnections(void) +int LivestatusListener::GetConnections() { boost::mutex::scoped_lock lock(l_ComponentMutex); return l_Connections; } -void LivestatusListener::ServerThreadProc(void) +void LivestatusListener::ServerThreadProc() { m_Listener->Listen(); diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp index 1b707b91f..a5a1abae2 100644 --- a/lib/livestatus/livestatuslistener.hpp +++ b/lib/livestatus/livestatuslistener.hpp @@ -42,8 +42,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - static int GetClientsConnected(void); - static int GetConnections(void); + static int GetClientsConnected(); + static int GetConnections(); virtual void ValidateSocketType(const String& value, const ValidationUtils& utils) override; @@ -52,7 +52,7 @@ protected: virtual void Stop(bool runtimeRemoved) override; private: - void ServerThreadProc(void); + void ServerThreadProc(); void ClientHandler(const Socket::Ptr& client); Socket::Ptr m_Listener; diff --git a/lib/livestatus/livestatuslogutility.hpp b/lib/livestatus/livestatuslogutility.hpp index 2a548f754..c2d934433 100644 --- a/lib/livestatus/livestatuslogutility.hpp +++ b/lib/livestatus/livestatuslogutility.hpp @@ -69,7 +69,7 @@ public: static Dictionary::Ptr GetAttributes(const String& text); private: - LivestatusLogUtility(void); + LivestatusLogUtility(); }; } diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp index c7b56be03..62b6016c4 100644 --- a/lib/livestatus/livestatusquery.cpp +++ b/lib/livestatus/livestatusquery.cpp @@ -279,7 +279,7 @@ LivestatusQuery::LivestatusQuery(const std::vector& lines, const String& m_Aggregators.swap(aggregators); } -int LivestatusQuery::GetExternalCommands(void) +int LivestatusQuery::GetExternalCommands() { boost::mutex::scoped_lock lock(l_QueryMutex); diff --git a/lib/livestatus/livestatusquery.hpp b/lib/livestatus/livestatusquery.hpp index a6e4c3655..d8583eb40 100644 --- a/lib/livestatus/livestatusquery.hpp +++ b/lib/livestatus/livestatusquery.hpp @@ -52,7 +52,7 @@ public: bool Execute(const Stream::Ptr& stream); - static int GetExternalCommands(void); + static int GetExternalCommands(); private: String m_Verb; diff --git a/lib/livestatus/logtable.cpp b/lib/livestatus/logtable.cpp index 3e069c004..df8ba859a 100644 --- a/lib/livestatus/logtable.cpp +++ b/lib/livestatus/logtable.cpp @@ -81,12 +81,12 @@ void LogTable::AddColumns(Table *table, const String& prefix, CommandsTable::AddColumns(table, "current_command_", std::bind(&LogTable::CommandAccessor, _1, objectAccessor)); } -String LogTable::GetName(void) const +String LogTable::GetName() const { return "log"; } -String LogTable::GetPrefix(void) const +String LogTable::GetPrefix() const { return "log"; } diff --git a/lib/livestatus/logtable.hpp b/lib/livestatus/logtable.hpp index 2b60fcc4d..1864660f7 100644 --- a/lib/livestatus/logtable.hpp +++ b/lib/livestatus/logtable.hpp @@ -41,8 +41,8 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp index c239d1c3b..8dcf861bc 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct MaxAggregatorState final : public AggregatorState { - MaxAggregatorState(void) + MaxAggregatorState() : Max(0) { } diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index dbffad4fe..93767c798 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga */ struct MinAggregatorState final : public AggregatorState { - MinAggregatorState(void) + MinAggregatorState() : Min(DBL_MAX) { } diff --git a/lib/livestatus/orfilter.cpp b/lib/livestatus/orfilter.cpp index 37e14fb32..586eec50c 100644 --- a/lib/livestatus/orfilter.cpp +++ b/lib/livestatus/orfilter.cpp @@ -21,7 +21,7 @@ using namespace icinga; -OrFilter::OrFilter(void) +OrFilter::OrFilter() { } bool OrFilter::Apply(const Table::Ptr& table, const Value& row) diff --git a/lib/livestatus/orfilter.hpp b/lib/livestatus/orfilter.hpp index e06179f03..a1a375eeb 100644 --- a/lib/livestatus/orfilter.hpp +++ b/lib/livestatus/orfilter.hpp @@ -35,7 +35,7 @@ class OrFilter final : public CombinerFilter public: DECLARE_PTR_TYPEDEFS(OrFilter); - OrFilter(void); + OrFilter(); virtual bool Apply(const Table::Ptr& table, const Value& row) override; }; diff --git a/lib/livestatus/servicegroupstable.cpp b/lib/livestatus/servicegroupstable.cpp index 1baf093f1..09c24db77 100644 --- a/lib/livestatus/servicegroupstable.cpp +++ b/lib/livestatus/servicegroupstable.cpp @@ -23,7 +23,7 @@ using namespace icinga; -ServiceGroupsTable::ServiceGroupsTable(void) +ServiceGroupsTable::ServiceGroupsTable() { AddColumns(this); } @@ -51,12 +51,12 @@ void ServiceGroupsTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "num_services_hard_unknown", Column(&ServiceGroupsTable::NumServicesHardUnknownAccessor, objectAccessor)); } -String ServiceGroupsTable::GetName(void) const +String ServiceGroupsTable::GetName() const { return "servicegroups"; } -String ServiceGroupsTable::GetPrefix(void) const +String ServiceGroupsTable::GetPrefix() const { return "servicegroup"; } diff --git a/lib/livestatus/servicegroupstable.hpp b/lib/livestatus/servicegroupstable.hpp index c66965307..a882f1292 100644 --- a/lib/livestatus/servicegroupstable.hpp +++ b/lib/livestatus/servicegroupstable.hpp @@ -35,13 +35,13 @@ class ServiceGroupsTable final : public Table public: DECLARE_PTR_TYPEDEFS(ServiceGroupsTable); - ServiceGroupsTable(void); + ServiceGroupsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/servicestable.cpp b/lib/livestatus/servicestable.cpp index 6dd8e9551..6c15efe4d 100644 --- a/lib/livestatus/servicestable.cpp +++ b/lib/livestatus/servicestable.cpp @@ -154,12 +154,12 @@ void ServicesTable::AddColumns(Table *table, const String& prefix, } } -String ServicesTable::GetName(void) const +String ServicesTable::GetName() const { return "services"; } -String ServicesTable::GetPrefix(void) const +String ServicesTable::GetPrefix() const { return "service"; } diff --git a/lib/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp index f64f4a257..d5de376b4 100644 --- a/lib/livestatus/servicestable.hpp +++ b/lib/livestatus/servicestable.hpp @@ -40,8 +40,8 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/statehisttable.cpp b/lib/livestatus/statehisttable.cpp index fad78333c..e1a56c933 100644 --- a/lib/livestatus/statehisttable.cpp +++ b/lib/livestatus/statehisttable.cpp @@ -244,12 +244,12 @@ void StateHistTable::AddColumns(Table *table, const String& prefix, ServicesTable::AddColumns(table, "current_service_", std::bind(&StateHistTable::ServiceAccessor, _1, objectAccessor)); } -String StateHistTable::GetName(void) const +String StateHistTable::GetName() const { return "log"; } -String StateHistTable::GetPrefix(void) const +String StateHistTable::GetPrefix() const { return "log"; } diff --git a/lib/livestatus/statehisttable.hpp b/lib/livestatus/statehisttable.hpp index 141dd31fd..d8fbd4217 100644 --- a/lib/livestatus/statehisttable.hpp +++ b/lib/livestatus/statehisttable.hpp @@ -42,8 +42,8 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/statustable.cpp b/lib/livestatus/statustable.cpp index 0aad7ab5e..c7f9f9771 100644 --- a/lib/livestatus/statustable.cpp +++ b/lib/livestatus/statustable.cpp @@ -29,7 +29,7 @@ using namespace icinga; -StatusTable::StatusTable(void) +StatusTable::StatusTable() { AddColumns(this); } @@ -102,12 +102,12 @@ void StatusTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "custom_variables", Column(&StatusTable::CustomVariablesAccessor, objectAccessor)); } -String StatusTable::GetName(void) const +String StatusTable::GetName() const { return "status"; } -String StatusTable::GetPrefix(void) const +String StatusTable::GetPrefix() const { return "status"; } diff --git a/lib/livestatus/statustable.hpp b/lib/livestatus/statustable.hpp index de59d12f4..ceb485c12 100644 --- a/lib/livestatus/statustable.hpp +++ b/lib/livestatus/statustable.hpp @@ -35,13 +35,13 @@ class StatusTable final : public Table public: DECLARE_PTR_TYPEDEFS(StatusTable); - StatusTable(void); + StatusTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp index cd49f9992..148551915 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct StdAggregatorState final : public AggregatorState { - StdAggregatorState(void) + StdAggregatorState() : StdSum(0), StdQSum(0), StdCount(0) { } diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index 32f8574bd..4630aad10 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -31,7 +31,7 @@ namespace icinga */ struct SumAggregatorState final : public AggregatorState { - SumAggregatorState(void) + SumAggregatorState() : Sum(0) { } diff --git a/lib/livestatus/table.cpp b/lib/livestatus/table.cpp index e6df72514..c1990f274 100644 --- a/lib/livestatus/table.cpp +++ b/lib/livestatus/table.cpp @@ -113,7 +113,7 @@ Column Table::GetColumn(const String& name) const return it->second; } -std::vector Table::GetColumnNames(void) const +std::vector Table::GetColumnNames() const { std::vector names; @@ -175,7 +175,7 @@ Value Table::EmptyDictionaryAccessor(const Value&) return new Dictionary(); } -LivestatusGroupByType Table::GetGroupByType(void) const +LivestatusGroupByType Table::GetGroupByType() const { return m_GroupByType; } diff --git a/lib/livestatus/table.hpp b/lib/livestatus/table.hpp index 0dddf40ed..5a3094e05 100644 --- a/lib/livestatus/table.hpp +++ b/lib/livestatus/table.hpp @@ -49,16 +49,16 @@ public: static Table::Ptr GetByName(const String& name, const String& compat_log_path = "", const unsigned long& from = 0, const unsigned long& until = 0); - virtual String GetName(void) const = 0; - virtual String GetPrefix(void) const = 0; + virtual String GetName() const = 0; + virtual String GetPrefix() const = 0; std::vector FilterRows(const intrusive_ptr& filter, int limit = -1); void AddColumn(const String& name, const Column& column); Column GetColumn(const String& name) const; - std::vector GetColumnNames(void) const; + std::vector GetColumnNames() const; - LivestatusGroupByType GetGroupByType(void) const; + LivestatusGroupByType GetGroupByType() const; protected: Table(LivestatusGroupByType type = LivestatusGroupByNone); diff --git a/lib/livestatus/timeperiodstable.cpp b/lib/livestatus/timeperiodstable.cpp index f7c042aaf..bb1329511 100644 --- a/lib/livestatus/timeperiodstable.cpp +++ b/lib/livestatus/timeperiodstable.cpp @@ -28,7 +28,7 @@ using namespace icinga; -TimePeriodsTable::TimePeriodsTable(void) +TimePeriodsTable::TimePeriodsTable() { AddColumns(this); } @@ -41,12 +41,12 @@ void TimePeriodsTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "in", Column(&TimePeriodsTable::InAccessor, objectAccessor)); } -String TimePeriodsTable::GetName(void) const +String TimePeriodsTable::GetName() const { return "timeperiod"; } -String TimePeriodsTable::GetPrefix(void) const +String TimePeriodsTable::GetPrefix() const { return "timeperiod"; } diff --git a/lib/livestatus/timeperiodstable.hpp b/lib/livestatus/timeperiodstable.hpp index 2f84f19f3..eae3b3c80 100644 --- a/lib/livestatus/timeperiodstable.hpp +++ b/lib/livestatus/timeperiodstable.hpp @@ -35,13 +35,13 @@ class TimePeriodsTable final : public Table public: DECLARE_PTR_TYPEDEFS(TimePeriodsTable); - TimePeriodsTable(void); + TimePeriodsTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/livestatus/zonestable.cpp b/lib/livestatus/zonestable.cpp index 5ab730f81..87d086ae0 100644 --- a/lib/livestatus/zonestable.cpp +++ b/lib/livestatus/zonestable.cpp @@ -23,7 +23,7 @@ using namespace icinga; -ZonesTable::ZonesTable(void) +ZonesTable::ZonesTable() { AddColumns(this); } @@ -37,12 +37,12 @@ void ZonesTable::AddColumns(Table *table, const String& prefix, table->AddColumn(prefix + "global", Column(&ZonesTable::GlobalAccessor, objectAccessor)); } -String ZonesTable::GetName(void) const +String ZonesTable::GetName() const { return "zones"; } -String ZonesTable::GetPrefix(void) const +String ZonesTable::GetPrefix() const { return "zone"; } diff --git a/lib/livestatus/zonestable.hpp b/lib/livestatus/zonestable.hpp index 89dc33ead..e81ba2b93 100644 --- a/lib/livestatus/zonestable.hpp +++ b/lib/livestatus/zonestable.hpp @@ -35,13 +35,13 @@ class ZonesTable final : public Table public: DECLARE_PTR_TYPEDEFS(ZonesTable); - ZonesTable(void); + ZonesTable(); static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const override; - virtual String GetPrefix(void) const override; + virtual String GetName() const override; + virtual String GetPrefix() const override; protected: virtual void FetchRows(const AddRowFunction& addRowFn) override; diff --git a/lib/methods/clrchecktask.cpp b/lib/methods/clrchecktask.cpp index 01fa626d7..f639ac47e 100644 --- a/lib/methods/clrchecktask.cpp +++ b/lib/methods/clrchecktask.cpp @@ -47,7 +47,7 @@ static std::map l_Objects; static mscorlib::_AppDomainPtr l_AppDomain; -static void InitializeClr(void) +static void InitializeClr() { ICorRuntimeHost *runtimeHost; diff --git a/lib/methods/clrchecktask.hpp b/lib/methods/clrchecktask.hpp index c44764f56..407405ef9 100644 --- a/lib/methods/clrchecktask.hpp +++ b/lib/methods/clrchecktask.hpp @@ -39,7 +39,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - ClrCheckTask(void); + ClrCheckTask(); }; } diff --git a/lib/methods/clusterchecktask.hpp b/lib/methods/clusterchecktask.hpp index cfdcadcb5..ecdf5d6db 100644 --- a/lib/methods/clusterchecktask.hpp +++ b/lib/methods/clusterchecktask.hpp @@ -37,7 +37,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - ClusterCheckTask(void); + ClusterCheckTask(); static String FormatArray(const Array::Ptr& arr); }; diff --git a/lib/methods/clusterzonechecktask.hpp b/lib/methods/clusterzonechecktask.hpp index 0cfb5b5ef..d3c2f392b 100644 --- a/lib/methods/clusterzonechecktask.hpp +++ b/lib/methods/clusterzonechecktask.hpp @@ -37,7 +37,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - ClusterZoneCheckTask(void); + ClusterZoneCheckTask(); }; } diff --git a/lib/methods/dummychecktask.hpp b/lib/methods/dummychecktask.hpp index 065f63c39..83fd476cf 100644 --- a/lib/methods/dummychecktask.hpp +++ b/lib/methods/dummychecktask.hpp @@ -39,7 +39,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - DummyCheckTask(void); + DummyCheckTask(); }; } diff --git a/lib/methods/exceptionchecktask.hpp b/lib/methods/exceptionchecktask.hpp index d55b8694d..99fc0a5c2 100644 --- a/lib/methods/exceptionchecktask.hpp +++ b/lib/methods/exceptionchecktask.hpp @@ -38,7 +38,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - ExceptionCheckTask(void); + ExceptionCheckTask(); }; } diff --git a/lib/methods/icingachecktask.hpp b/lib/methods/icingachecktask.hpp index fe74efc05..2868f6840 100644 --- a/lib/methods/icingachecktask.hpp +++ b/lib/methods/icingachecktask.hpp @@ -38,7 +38,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - IcingaCheckTask(void); + IcingaCheckTask(); }; } diff --git a/lib/methods/nullchecktask.hpp b/lib/methods/nullchecktask.hpp index 3afe491a9..cf41c3e75 100644 --- a/lib/methods/nullchecktask.hpp +++ b/lib/methods/nullchecktask.hpp @@ -39,7 +39,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - NullCheckTask(void); + NullCheckTask(); }; } diff --git a/lib/methods/nulleventtask.hpp b/lib/methods/nulleventtask.hpp index 1aee38fd8..aac040a6f 100644 --- a/lib/methods/nulleventtask.hpp +++ b/lib/methods/nulleventtask.hpp @@ -39,7 +39,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - NullEventTask(void); + NullEventTask(); }; } diff --git a/lib/methods/pluginchecktask.hpp b/lib/methods/pluginchecktask.hpp index 7095119b3..19c10b4ff 100644 --- a/lib/methods/pluginchecktask.hpp +++ b/lib/methods/pluginchecktask.hpp @@ -39,7 +39,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - PluginCheckTask(void); + PluginCheckTask(); static void ProcessFinishedHandler(const Checkable::Ptr& service, const CheckResult::Ptr& cr, const Value& commandLine, const ProcessResult& pr); diff --git a/lib/methods/plugineventtask.hpp b/lib/methods/plugineventtask.hpp index 8801a5142..0739bd13f 100644 --- a/lib/methods/plugineventtask.hpp +++ b/lib/methods/plugineventtask.hpp @@ -39,7 +39,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - PluginEventTask(void); + PluginEventTask(); static void ProcessFinishedHandler(const Checkable::Ptr& checkable, const Value& commandLine, const ProcessResult& pr); diff --git a/lib/methods/pluginnotificationtask.hpp b/lib/methods/pluginnotificationtask.hpp index 546d63384..3fe7db757 100644 --- a/lib/methods/pluginnotificationtask.hpp +++ b/lib/methods/pluginnotificationtask.hpp @@ -42,7 +42,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - PluginNotificationTask(void); + PluginNotificationTask(); static void ProcessFinishedHandler(const Checkable::Ptr& checkable, const Value& commandLine, const ProcessResult& pr); diff --git a/lib/methods/randomchecktask.hpp b/lib/methods/randomchecktask.hpp index e2c47b15d..29b67cda3 100644 --- a/lib/methods/randomchecktask.hpp +++ b/lib/methods/randomchecktask.hpp @@ -38,7 +38,7 @@ public: const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); private: - RandomCheckTask(void); + RandomCheckTask(); }; } diff --git a/lib/methods/timeperiodtask.hpp b/lib/methods/timeperiodtask.hpp index dd56e596a..2bfe7eac4 100644 --- a/lib/methods/timeperiodtask.hpp +++ b/lib/methods/timeperiodtask.hpp @@ -37,7 +37,7 @@ public: static Array::Ptr EvenMinutesTimePeriodUpdate(const TimePeriod::Ptr& tp, double begin, double end); private: - TimePeriodTask(void); + TimePeriodTask(); }; } diff --git a/lib/mysql_shim/mysqlinterface.cpp b/lib/mysql_shim/mysqlinterface.cpp index d7e40e7ed..b02482f8e 100644 --- a/lib/mysql_shim/mysqlinterface.cpp +++ b/lib/mysql_shim/mysqlinterface.cpp @@ -23,7 +23,7 @@ using namespace icinga; struct MysqlInterfaceImpl final : public MysqlInterface { - void Destroy(void) override + void Destroy() override { delete this; } @@ -119,13 +119,13 @@ struct MysqlInterfaceImpl final : public MysqlInterface return mysql_store_result(mysql); } - unsigned int thread_safe(void) const override + unsigned int thread_safe() const override { return mysql_thread_safe(); } }; -MysqlInterface *create_mysql_shim(void) +MysqlInterface *create_mysql_shim() { return new MysqlInterfaceImpl(); } diff --git a/lib/mysql_shim/mysqlinterface.hpp b/lib/mysql_shim/mysqlinterface.hpp index 77b4039d9..bdc63874e 100644 --- a/lib/mysql_shim/mysqlinterface.hpp +++ b/lib/mysql_shim/mysqlinterface.hpp @@ -32,7 +32,7 @@ struct MysqlInterface MysqlInterface(const MysqlInterface&) = delete; MysqlInterface& operator=(MysqlInterface&) = delete; - virtual void Destroy(void) = 0; + virtual void Destroy() = 0; virtual my_ulonglong affected_rows(MYSQL *mysql) const = 0; virtual void close(MYSQL *sock) const = 0; @@ -54,11 +54,11 @@ struct MysqlInterface virtual unsigned long real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length) const = 0; virtual my_bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const = 0; virtual MYSQL_RES *store_result(MYSQL *mysql) const = 0; - virtual unsigned int thread_safe(void) const = 0; + virtual unsigned int thread_safe() const = 0; protected: - MysqlInterface(void) = default; - ~MysqlInterface(void) = default; + MysqlInterface() = default; + ~MysqlInterface() = default; }; struct MysqlInterfaceDeleter @@ -73,9 +73,9 @@ struct MysqlInterfaceDeleter extern "C" { - MYSQL_SHIM_EXPORT icinga::MysqlInterface *create_mysql_shim(void); + MYSQL_SHIM_EXPORT icinga::MysqlInterface *create_mysql_shim(); } -typedef icinga::MysqlInterface *(*create_mysql_shim_ptr)(void); +typedef icinga::MysqlInterface *(*create_mysql_shim_ptr)(); #endif /* MYSQLINTERFACE_H */ diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp index 76eac8504..a3bd06797 100644 --- a/lib/notification/notificationcomponent.cpp +++ b/lib/notification/notificationcomponent.cpp @@ -77,7 +77,7 @@ void NotificationComponent::Stop(bool runtimeRemoved) * * @param - Event arguments for the timer. */ -void NotificationComponent::NotificationTimerHandler(void) +void NotificationComponent::NotificationTimerHandler() { double now = Utility::GetTime(); diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp index 3dd98d02e..0278916cd 100644 --- a/lib/notification/notificationcomponent.hpp +++ b/lib/notification/notificationcomponent.hpp @@ -45,7 +45,7 @@ public: private: Timer::Ptr m_NotificationTimer; - void NotificationTimerHandler(void); + void NotificationTimerHandler(); void SendNotificationsHandler(const Checkable::Ptr& checkable, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text); }; diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp index 0425193d6..3a99cf132 100644 --- a/lib/perfdata/elasticsearchwriter.cpp +++ b/lib/perfdata/elasticsearchwriter.cpp @@ -43,11 +43,11 @@ REGISTER_TYPE(ElasticsearchWriter); REGISTER_STATSFUNCTION(ElasticsearchWriter, &ElasticsearchWriter::StatsFunc); -ElasticsearchWriter::ElasticsearchWriter(void) +ElasticsearchWriter::ElasticsearchWriter() : m_WorkQueue(10000000, 1) { } -void ElasticsearchWriter::OnConfigLoaded(void) +void ElasticsearchWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -373,7 +373,7 @@ void ElasticsearchWriter::Enqueue(String type, const Dictionary::Ptr& fields, do } } -void ElasticsearchWriter::FlushTimeout(void) +void ElasticsearchWriter::FlushTimeout() { /* Prevent new data points from being added to the array, there is a * race condition where they could disappear. @@ -388,7 +388,7 @@ void ElasticsearchWriter::FlushTimeout(void) } } -void ElasticsearchWriter::Flush(void) +void ElasticsearchWriter::Flush() { /* Ensure you hold a lock against m_DataBuffer so that things * don't go missing after creating the body and clearing the buffer. @@ -523,7 +523,7 @@ void ElasticsearchWriter::SendRequest(const String& body) } } -Stream::Ptr ElasticsearchWriter::Connect(void) +Stream::Ptr ElasticsearchWriter::Connect() { TcpSocket::Ptr socket = new TcpSocket(); @@ -565,7 +565,7 @@ Stream::Ptr ElasticsearchWriter::Connect(void) } } -void ElasticsearchWriter::AssertOnWorkQueue(void) +void ElasticsearchWriter::AssertOnWorkQueue() { ASSERT(m_WorkQueue.IsWorkerThread()); } diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp index ed0c3a8ad..fe484da07 100644 --- a/lib/perfdata/elasticsearchwriter.hpp +++ b/lib/perfdata/elasticsearchwriter.hpp @@ -35,14 +35,14 @@ public: DECLARE_OBJECT(ElasticsearchWriter); DECLARE_OBJECTNAME(ElasticsearchWriter); - ElasticsearchWriter(void); + ElasticsearchWriter(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); static String FormatTimestamp(double ts); protected: - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; @@ -68,11 +68,11 @@ private: void Enqueue(String type, const Dictionary::Ptr& fields, double ts); - Stream::Ptr Connect(void); - void AssertOnWorkQueue(void); + Stream::Ptr Connect(); + void AssertOnWorkQueue(); void ExceptionHandler(boost::exception_ptr exp); - void FlushTimeout(void); - void Flush(void); + void FlushTimeout(); + void Flush(); void SendRequest(const String& body); }; diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp index 8f166ed42..16fd77d94 100644 --- a/lib/perfdata/gelfwriter.cpp +++ b/lib/perfdata/gelfwriter.cpp @@ -45,11 +45,11 @@ REGISTER_TYPE(GelfWriter); REGISTER_STATSFUNCTION(GelfWriter, &GelfWriter::StatsFunc); -GelfWriter::GelfWriter(void) +GelfWriter::GelfWriter() : m_WorkQueue(10000000, 1) { } -void GelfWriter::OnConfigLoaded(void) +void GelfWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -112,7 +112,7 @@ void GelfWriter::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -void GelfWriter::AssertOnWorkQueue(void) +void GelfWriter::AssertOnWorkQueue() { ASSERT(m_WorkQueue.IsWorkerThread()); } @@ -131,7 +131,7 @@ void GelfWriter::ExceptionHandler(boost::exception_ptr exp) } } -void GelfWriter::Reconnect(void) +void GelfWriter::Reconnect() { AssertOnWorkQueue(); @@ -165,12 +165,12 @@ void GelfWriter::Reconnect(void) << "Finished reconnecting to Graylog Gelf in " << std::setw(2) << Utility::GetTime() - startTime << " second(s)."; } -void GelfWriter::ReconnectTimerHandler(void) +void GelfWriter::ReconnectTimerHandler() { m_WorkQueue.Enqueue(std::bind(&GelfWriter::Reconnect, this), PriorityNormal); } -void GelfWriter::Disconnect(void) +void GelfWriter::Disconnect() { AssertOnWorkQueue(); diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp index 0ea62c349..7b75e88f3 100644 --- a/lib/perfdata/gelfwriter.hpp +++ b/lib/perfdata/gelfwriter.hpp @@ -42,12 +42,12 @@ public: DECLARE_OBJECT(GelfWriter); DECLARE_OBJECTNAME(GelfWriter); - GelfWriter(void); + GelfWriter(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; @@ -71,12 +71,12 @@ private: String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source, double ts); void SendLogMessage(const String& gelfMessage); - void ReconnectTimerHandler(void); + void ReconnectTimerHandler(); - void Disconnect(void); - void Reconnect(void); + void Disconnect(); + void Reconnect(); - void AssertOnWorkQueue(void); + void AssertOnWorkQueue(); void ExceptionHandler(boost::exception_ptr exp); }; diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp index 46a0721bc..c4721a778 100644 --- a/lib/perfdata/graphitewriter.cpp +++ b/lib/perfdata/graphitewriter.cpp @@ -45,11 +45,11 @@ REGISTER_TYPE(GraphiteWriter); REGISTER_STATSFUNCTION(GraphiteWriter, &GraphiteWriter::StatsFunc); -GraphiteWriter::GraphiteWriter(void) +GraphiteWriter::GraphiteWriter() : m_WorkQueue(10000000, 1) { } -void GraphiteWriter::OnConfigLoaded(void) +void GraphiteWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -109,7 +109,7 @@ void GraphiteWriter::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -void GraphiteWriter::AssertOnWorkQueue(void) +void GraphiteWriter::AssertOnWorkQueue() { ASSERT(m_WorkQueue.IsWorkerThread()); } @@ -128,7 +128,7 @@ void GraphiteWriter::ExceptionHandler(boost::exception_ptr exp) } } -void GraphiteWriter::Reconnect(void) +void GraphiteWriter::Reconnect() { AssertOnWorkQueue(); @@ -162,12 +162,12 @@ void GraphiteWriter::Reconnect(void) << "Finished reconnecting to Graphite in " << std::setw(2) << Utility::GetTime() - startTime << " second(s)."; } -void GraphiteWriter::ReconnectTimerHandler(void) +void GraphiteWriter::ReconnectTimerHandler() { m_WorkQueue.Enqueue(std::bind(&GraphiteWriter::Reconnect, this), PriorityNormal); } -void GraphiteWriter::Disconnect(void) +void GraphiteWriter::Disconnect() { AssertOnWorkQueue(); diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp index a26b15bd5..9fed91629 100644 --- a/lib/perfdata/graphitewriter.hpp +++ b/lib/perfdata/graphitewriter.hpp @@ -42,7 +42,7 @@ public: DECLARE_OBJECT(GraphiteWriter); DECLARE_OBJECTNAME(GraphiteWriter); - GraphiteWriter(void); + GraphiteWriter(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); @@ -50,7 +50,7 @@ public: virtual void ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils) override; protected: - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; @@ -68,12 +68,12 @@ private: static String EscapeMetricLabel(const String& str); static Value EscapeMacroMetric(const Value& value); - void ReconnectTimerHandler(void); + void ReconnectTimerHandler(); - void Disconnect(void); - void Reconnect(void); + void Disconnect(); + void Reconnect(); - void AssertOnWorkQueue(void); + void AssertOnWorkQueue(); void ExceptionHandler(boost::exception_ptr exp); }; diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp index 58e0509e1..6bd99d659 100644 --- a/lib/perfdata/influxdbwriter.cpp +++ b/lib/perfdata/influxdbwriter.cpp @@ -58,7 +58,7 @@ public: : m_Value(value) { } - int GetValue(void) const + int GetValue() const { return m_Value; } @@ -71,11 +71,11 @@ REGISTER_TYPE(InfluxdbWriter); REGISTER_STATSFUNCTION(InfluxdbWriter, &InfluxdbWriter::StatsFunc); -InfluxdbWriter::InfluxdbWriter(void) +InfluxdbWriter::InfluxdbWriter() : m_WorkQueue(10000000, 1) { } -void InfluxdbWriter::OnConfigLoaded(void) +void InfluxdbWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -137,7 +137,7 @@ void InfluxdbWriter::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -void InfluxdbWriter::AssertOnWorkQueue(void) +void InfluxdbWriter::AssertOnWorkQueue() { ASSERT(m_WorkQueue.IsWorkerThread()); } @@ -152,7 +152,7 @@ void InfluxdbWriter::ExceptionHandler(boost::exception_ptr exp) //TODO: Close the connection, if we keep it open. } -Stream::Ptr InfluxdbWriter::Connect(void) +Stream::Ptr InfluxdbWriter::Connect() { TcpSocket::Ptr socket = new TcpSocket(); @@ -387,12 +387,12 @@ void InfluxdbWriter::SendMetric(const Dictionary::Ptr& tmpl, const String& label } } -void InfluxdbWriter::FlushTimeout(void) +void InfluxdbWriter::FlushTimeout() { m_WorkQueue.Enqueue(boost::bind(&InfluxdbWriter::FlushTimeoutWQ, this), PriorityHigh); } -void InfluxdbWriter::FlushTimeoutWQ(void) +void InfluxdbWriter::FlushTimeoutWQ() { AssertOnWorkQueue(); @@ -406,7 +406,7 @@ void InfluxdbWriter::FlushTimeoutWQ(void) Flush(); } -void InfluxdbWriter::Flush(void) +void InfluxdbWriter::Flush() { String body = boost::algorithm::join(m_DataBuffer, "\n"); m_DataBuffer.clear(); diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp index e950475e7..2576a4b84 100644 --- a/lib/perfdata/influxdbwriter.hpp +++ b/lib/perfdata/influxdbwriter.hpp @@ -42,7 +42,7 @@ public: DECLARE_OBJECT(InfluxdbWriter); DECLARE_OBJECTNAME(InfluxdbWriter); - InfluxdbWriter(void); + InfluxdbWriter(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); @@ -50,7 +50,7 @@ public: virtual void ValidateServiceTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void OnConfigLoaded(void) override; + virtual void OnConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeRemoved) override; @@ -62,16 +62,16 @@ private: void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void CheckResultHandlerWQ(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void SendMetric(const Dictionary::Ptr& tmpl, const String& label, const Dictionary::Ptr& fields, double ts); - void FlushTimeout(void); - void FlushTimeoutWQ(void); - void Flush(void); + void FlushTimeout(); + void FlushTimeoutWQ(); + void Flush(); static String EscapeKeyOrTagValue(const String& str); static String EscapeValue(const Value& value); Stream::Ptr Connect(); - void AssertOnWorkQueue(void); + void AssertOnWorkQueue(); void ExceptionHandler(boost::exception_ptr exp); }; diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp index c64cc6afb..9bbbbfa54 100644 --- a/lib/perfdata/opentsdbwriter.cpp +++ b/lib/perfdata/opentsdbwriter.cpp @@ -81,7 +81,7 @@ void OpenTsdbWriter::Stop(bool runtimeRemoved) ObjectImpl::Stop(runtimeRemoved); } -void OpenTsdbWriter::ReconnectTimerHandler(void) +void OpenTsdbWriter::ReconnectTimerHandler() { if (m_Stream) return; diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp index b659d5434..069588e8d 100644 --- a/lib/perfdata/opentsdbwriter.hpp +++ b/lib/perfdata/opentsdbwriter.hpp @@ -58,7 +58,7 @@ private: static String EscapeTag(const String& str); static String EscapeMetric(const String& str); - void ReconnectTimerHandler(void); + void ReconnectTimerHandler(); }; } diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp index 55d82fd36..5b726a937 100644 --- a/lib/perfdata/perfdatawriter.cpp +++ b/lib/perfdata/perfdatawriter.cpp @@ -152,7 +152,7 @@ void PerfdataWriter::RotateFile(std::ofstream& output, const String& temp_path, << "Could not open perfdata file '" << temp_path << "' for writing. Perfdata will be lost."; } -void PerfdataWriter::RotationTimerHandler(void) +void PerfdataWriter::RotationTimerHandler() { RotateFile(m_ServiceOutputFile, GetServiceTempPath(), GetServicePerfdataPath()); RotateFile(m_HostOutputFile, GetHostTempPath(), GetHostPerfdataPath()); diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp index 6639fad15..8c6726fdd 100644 --- a/lib/perfdata/perfdatawriter.hpp +++ b/lib/perfdata/perfdatawriter.hpp @@ -54,7 +54,7 @@ private: static Value EscapeMacroMetric(const Value& value); Timer::Ptr m_RotationTimer; - void RotationTimerHandler(void); + void RotationTimerHandler(); std::ofstream m_ServiceOutputFile; std::ofstream m_HostOutputFile; diff --git a/lib/pgsql_shim/pgsqlinterface.cpp b/lib/pgsql_shim/pgsqlinterface.cpp index 31f0f2e76..9760d1574 100644 --- a/lib/pgsql_shim/pgsqlinterface.cpp +++ b/lib/pgsql_shim/pgsqlinterface.cpp @@ -23,7 +23,7 @@ using namespace icinga; struct PgsqlInterfaceImpl final : public PgsqlInterface { - void Destroy(void) override + void Destroy() override { delete this; } @@ -73,7 +73,7 @@ struct PgsqlInterfaceImpl final : public PgsqlInterface return PQgetvalue(res, tup_num, field_num); } - int isthreadsafe(void) const override + int isthreadsafe() const override { return PQisthreadsafe(); } @@ -114,7 +114,7 @@ struct PgsqlInterfaceImpl final : public PgsqlInterface } }; -PgsqlInterface *create_pgsql_shim(void) +PgsqlInterface *create_pgsql_shim() { return new PgsqlInterfaceImpl(); } diff --git a/lib/pgsql_shim/pgsqlinterface.hpp b/lib/pgsql_shim/pgsqlinterface.hpp index 58a733a73..9a1079287 100644 --- a/lib/pgsql_shim/pgsqlinterface.hpp +++ b/lib/pgsql_shim/pgsqlinterface.hpp @@ -32,7 +32,7 @@ struct PgsqlInterface PgsqlInterface(const PgsqlInterface&) = delete; PgsqlInterface& operator=(PgsqlInterface&) = delete; - virtual void Destroy(void) = 0; + virtual void Destroy() = 0; virtual void clear(PGresult *res) const = 0; virtual char *cmdTuples(PGresult *res) const = 0; @@ -43,7 +43,7 @@ struct PgsqlInterface virtual char *fname(const PGresult *res, int field_num) const = 0; virtual int getisnull(const PGresult *res, int tup_num, int field_num) const = 0; virtual char *getvalue(const PGresult *res, int tup_num, int field_num) const = 0; - virtual int isthreadsafe(void) const = 0; + virtual int isthreadsafe() const = 0; virtual int nfields(const PGresult *res) const = 0; virtual int ntuples(const PGresult *res) const = 0; virtual char *resultErrorMessage(const PGresult *res) const = 0; @@ -53,8 +53,8 @@ struct PgsqlInterface virtual ConnStatusType status(const PGconn *conn) const = 0; protected: - PgsqlInterface(void) = default; - ~PgsqlInterface(void) = default; + PgsqlInterface() = default; + ~PgsqlInterface() = default; }; struct PgsqlInterfaceDeleter @@ -69,9 +69,9 @@ struct PgsqlInterfaceDeleter extern "C" { - PGSQL_SHIM_EXPORT icinga::PgsqlInterface *create_pgsql_shim(void); + PGSQL_SHIM_EXPORT icinga::PgsqlInterface *create_pgsql_shim(); } -typedef icinga::PgsqlInterface *(*create_pgsql_shim_ptr)(void); +typedef icinga::PgsqlInterface *(*create_pgsql_shim_ptr)(); #endif /* PGSQLINTERFACE_H */ diff --git a/lib/remote/apiaction.cpp b/lib/remote/apiaction.cpp index cf70cadad..86f6b1f75 100644 --- a/lib/remote/apiaction.cpp +++ b/lib/remote/apiaction.cpp @@ -31,7 +31,7 @@ Value ApiAction::Invoke(const ConfigObject::Ptr& target, const Dictionary::Ptr& return m_Callback(target, params); } -const std::vector& ApiAction::GetTypes(void) const +const std::vector& ApiAction::GetTypes() const { return m_Types; } @@ -51,7 +51,7 @@ void ApiAction::Unregister(const String& name) ApiActionRegistry::GetInstance()->Unregister(name); } -ApiActionRegistry *ApiActionRegistry::GetInstance(void) +ApiActionRegistry *ApiActionRegistry::GetInstance() { return Singleton::GetInstance(); } diff --git a/lib/remote/apiaction.hpp b/lib/remote/apiaction.hpp index 4c827a4d6..97645b493 100644 --- a/lib/remote/apiaction.hpp +++ b/lib/remote/apiaction.hpp @@ -49,7 +49,7 @@ public: Value Invoke(const ConfigObject::Ptr& target, const Dictionary::Ptr& params); - const std::vector& GetTypes(void) const; + const std::vector& GetTypes() const; static ApiAction::Ptr GetByName(const String& name); static void Register(const String& name, const ApiAction::Ptr& action); @@ -68,7 +68,7 @@ private: class ApiActionRegistry : public Registry { public: - static ApiActionRegistry *GetInstance(void); + static ApiActionRegistry *GetInstance(); }; #define REGISTER_APIACTION(name, types, callback) \ diff --git a/lib/remote/apifunction.cpp b/lib/remote/apifunction.cpp index 47d5bdaea..4cafab1d7 100644 --- a/lib/remote/apifunction.cpp +++ b/lib/remote/apifunction.cpp @@ -46,7 +46,7 @@ void ApiFunction::Unregister(const String& name) ApiFunctionRegistry::GetInstance()->Unregister(name); } -ApiFunctionRegistry *ApiFunctionRegistry::GetInstance(void) +ApiFunctionRegistry *ApiFunctionRegistry::GetInstance() { return Singleton::GetInstance(); } diff --git a/lib/remote/apifunction.hpp b/lib/remote/apifunction.hpp index e16809c10..a2b652da9 100644 --- a/lib/remote/apifunction.hpp +++ b/lib/remote/apifunction.hpp @@ -62,7 +62,7 @@ private: class ApiFunctionRegistry : public Registry { public: - static ApiFunctionRegistry *GetInstance(void); + static ApiFunctionRegistry *GetInstance(); }; #define REGISTER_APIFUNCTION(name, ns, callback) \ diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp index 255860545..1ce23b102 100644 --- a/lib/remote/apilistener-filesync.cpp +++ b/lib/remote/apilistener-filesync.cpp @@ -214,7 +214,7 @@ void ApiListener::SyncZoneDir(const Zone::Ptr& zone) const UpdateConfigDir(oldConfigInfo, newConfigInfo, oldDir, true); } -void ApiListener::SyncZoneDirs(void) const +void ApiListener::SyncZoneDirs() const { for (const Zone::Ptr& zone : ConfigType::GetObjectsByType()) { try { diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 2885bf217..0bf250050 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -48,44 +48,44 @@ REGISTER_STATSFUNCTION(ApiListener, &ApiListener::StatsFunc); REGISTER_APIFUNCTION(Hello, icinga, &ApiListener::HelloAPIHandler); -ApiListener::ApiListener(void) +ApiListener::ApiListener() : m_SyncQueue(0, 4), m_LogMessageCount(0) { m_RelayQueue.SetName("ApiListener, RelayQueue"); m_SyncQueue.SetName("ApiListener, SyncQueue"); } -String ApiListener::GetApiDir(void) +String ApiListener::GetApiDir() { return Application::GetLocalStateDir() + "/lib/icinga2/api/"; } -String ApiListener::GetCertsDir(void) +String ApiListener::GetCertsDir() { return Application::GetLocalStateDir() + "/lib/icinga2/certs/"; } -String ApiListener::GetCaDir(void) +String ApiListener::GetCaDir() { return Application::GetLocalStateDir() + "/lib/icinga2/ca/"; } -String ApiListener::GetCertificateRequestsDir(void) +String ApiListener::GetCertificateRequestsDir() { return Application::GetLocalStateDir() + "/lib/icinga2/certificate-requests/"; } -String ApiListener::GetDefaultCertPath(void) +String ApiListener::GetDefaultCertPath() { return GetCertsDir() + "/" + ScriptGlobal::Get("NodeName") + ".crt"; } -String ApiListener::GetDefaultKeyPath(void) +String ApiListener::GetDefaultKeyPath() { return GetCertsDir() + "/" + ScriptGlobal::Get("NodeName") + ".key"; } -String ApiListener::GetDefaultCaPath(void) +String ApiListener::GetDefaultCaPath() { return GetCertsDir() + "/ca.crt"; } @@ -103,7 +103,7 @@ void ApiListener::CopyCertificateFile(const String& oldCertPath, const String& n } } -void ApiListener::OnConfigLoaded(void) +void ApiListener::OnConfigLoaded() { if (m_Instance) BOOST_THROW_EXCEPTION(ScriptError("Only one ApiListener object is allowed.", GetDebugInfo())); @@ -149,7 +149,7 @@ void ApiListener::OnConfigLoaded(void) UpdateSSLContext(); } -void ApiListener::UpdateSSLContext(void) +void ApiListener::UpdateSSLContext() { std::shared_ptr context; @@ -199,7 +199,7 @@ void ApiListener::UpdateSSLContext(void) } } -void ApiListener::OnAllConfigLoaded(void) +void ApiListener::OnAllConfigLoaded() { m_LocalEndpoint = Endpoint::GetByName(GetIdentity()); @@ -269,12 +269,12 @@ void ApiListener::Stop(bool runtimeDeleted) CloseLogFile(); } -ApiListener::Ptr ApiListener::GetInstance(void) +ApiListener::Ptr ApiListener::GetInstance() { return m_Instance; } -Endpoint::Ptr ApiListener::GetMaster(void) const +Endpoint::Ptr ApiListener::GetMaster() const { Zone::Ptr zone = Zone::GetLocalZone(); @@ -292,7 +292,7 @@ Endpoint::Ptr ApiListener::GetMaster(void) const return Endpoint::GetByName(*names.begin()); } -bool ApiListener::IsMaster(void) const +bool ApiListener::IsMaster() const { Endpoint::Ptr master = GetMaster(); @@ -626,7 +626,7 @@ void ApiListener::SyncClient(const JsonRpcConnection::Ptr& aclient, const Endpoi << "Finished syncing endpoint '" << endpoint->GetName() << "' in zone '" << eZone->GetName() << "'."; } -void ApiListener::ApiTimerHandler(void) +void ApiListener::ApiTimerHandler() { double now = Utility::GetTime(); @@ -695,7 +695,7 @@ void ApiListener::ApiTimerHandler(void) } } -void ApiListener::ApiReconnectTimerHandler(void) +void ApiListener::ApiReconnectTimerHandler() { Zone::Ptr my_zone = Zone::GetLocalZone(); @@ -780,7 +780,7 @@ static void CleanupCertificateRequest(const String& path, double expiryTime) (void) unlink(path.CStr()); } -void ApiListener::CleanupCertificateRequestsTimerHandler(void) +void ApiListener::CleanupCertificateRequestsTimerHandler() { String requestsDir = GetCertificateRequestsDir(); @@ -986,7 +986,7 @@ void ApiListener::SyncRelayMessage(const MessageOrigin::Ptr& origin, } /* must hold m_LogLock */ -void ApiListener::OpenLogFile(void) +void ApiListener::OpenLogFile() { String path = GetApiDir() + "log/current"; @@ -1006,7 +1006,7 @@ void ApiListener::OpenLogFile(void) } /* must hold m_LogLock */ -void ApiListener::CloseLogFile(void) +void ApiListener::CloseLogFile() { if (!m_LogFile) return; @@ -1016,7 +1016,7 @@ void ApiListener::CloseLogFile(void) } /* must hold m_LogLock */ -void ApiListener::RotateLogFile(void) +void ApiListener::RotateLogFile() { double ts = GetLogMessageTimestamp(); @@ -1217,7 +1217,7 @@ void ApiListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& per status->Set("api", stats.first); } -std::pair ApiListener::GetStatus(void) +std::pair ApiListener::GetStatus() { Dictionary::Ptr status = new Dictionary(); Dictionary::Ptr perfdata = new Dictionary(); @@ -1366,7 +1366,7 @@ void ApiListener::RemoveAnonymousClient(const JsonRpcConnection::Ptr& aclient) m_AnonymousClients.erase(aclient); } -std::set ApiListener::GetAnonymousClients(void) const +std::set ApiListener::GetAnonymousClients() const { boost::mutex::scoped_lock lock(m_AnonymousClientsLock); return m_AnonymousClients; @@ -1384,7 +1384,7 @@ void ApiListener::RemoveHttpClient(const HttpServerConnection::Ptr& aclient) m_HttpClients.erase(aclient); } -std::set ApiListener::GetHttpClients(void) const +std::set ApiListener::GetHttpClients() const { boost::mutex::scoped_lock lock(m_HttpClientsLock); return m_HttpClients; @@ -1395,7 +1395,7 @@ Value ApiListener::HelloAPIHandler(const MessageOrigin::Ptr& origin, const Dicti return Empty; } -Endpoint::Ptr ApiListener::GetLocalEndpoint(void) const +Endpoint::Ptr ApiListener::GetLocalEndpoint() const { return m_LocalEndpoint; } @@ -1419,7 +1419,7 @@ void ApiListener::ValidateTlsProtocolmin(const String& value, const ValidationUt } } -bool ApiListener::IsHACluster(void) +bool ApiListener::IsHACluster() { Zone::Ptr zone = Zone::GetLocalZone(); diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp index 8655e47cf..8224bb6d0 100644 --- a/lib/remote/apilistener.hpp +++ b/lib/remote/apilistener.hpp @@ -57,35 +57,35 @@ public: static boost::signals2::signal OnMasterChanged; - ApiListener(void); + ApiListener(); - static String GetApiDir(void); - static String GetCertsDir(void); - static String GetCaDir(void); - static String GetCertificateRequestsDir(void); + static String GetApiDir(); + static String GetCertsDir(); + static String GetCaDir(); + static String GetCertificateRequestsDir(); - void UpdateSSLContext(void); + void UpdateSSLContext(); - static ApiListener::Ptr GetInstance(void); + static ApiListener::Ptr GetInstance(); - Endpoint::Ptr GetMaster(void) const; - bool IsMaster(void) const; + Endpoint::Ptr GetMaster() const; + bool IsMaster() const; - Endpoint::Ptr GetLocalEndpoint(void) const; + Endpoint::Ptr GetLocalEndpoint() const; void SyncSendMessage(const Endpoint::Ptr& endpoint, const Dictionary::Ptr& message); void RelayMessage(const MessageOrigin::Ptr& origin, const ConfigObject::Ptr& secobj, const Dictionary::Ptr& message, bool log); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - std::pair GetStatus(void); + std::pair GetStatus(); void AddAnonymousClient(const JsonRpcConnection::Ptr& aclient); void RemoveAnonymousClient(const JsonRpcConnection::Ptr& aclient); - std::set GetAnonymousClients(void) const; + std::set GetAnonymousClients() const; void AddHttpClient(const HttpServerConnection::Ptr& aclient); void RemoveHttpClient(const HttpServerConnection::Ptr& aclient); - std::set GetHttpClients(void) const; + std::set GetHttpClients() const; static double CalculateZoneLag(const Endpoint::Ptr& endpoint); @@ -99,18 +99,18 @@ public: static Value HelloAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); - static void UpdateObjectAuthority(void); + static void UpdateObjectAuthority(); - static bool IsHACluster(void); + static bool IsHACluster(); static String GetFromZoneName(const Zone::Ptr& fromZone); - static String GetDefaultCertPath(void); - static String GetDefaultKeyPath(void); - static String GetDefaultCaPath(void); + static String GetDefaultCertPath(); + static String GetDefaultKeyPath(); + static String GetDefaultCaPath(); protected: - virtual void OnConfigLoaded(void) override; - virtual void OnAllConfigLoaded(void) override; + virtual void OnConfigLoaded() override; + virtual void OnAllConfigLoaded() override; virtual void Start(bool runtimeCreated) override; virtual void Stop(bool runtimeDeleted) override; @@ -133,9 +133,9 @@ private: static ApiListener::Ptr m_Instance; - void ApiTimerHandler(void); - void ApiReconnectTimerHandler(void); - void CleanupCertificateRequestsTimerHandler(void); + void ApiTimerHandler(); + void ApiReconnectTimerHandler(); + void CleanupCertificateRequestsTimerHandler(); bool AddListener(const String& node, const String& service); void AddConnection(const Endpoint::Ptr& endpoint); @@ -155,9 +155,9 @@ private: void SyncRelayMessage(const MessageOrigin::Ptr& origin, const ConfigObject::Ptr& secobj, const Dictionary::Ptr& message, bool log); void PersistMessage(const Dictionary::Ptr& message, const ConfigObject::Ptr& secobj); - void OpenLogFile(void); - void RotateLogFile(void); - void CloseLogFile(void); + void OpenLogFile(); + void RotateLogFile(); + void CloseLogFile(); static void LogGlobHandler(std::vector& files, const String& file); void ReplayLog(const JsonRpcConnection::Ptr& client); @@ -168,7 +168,7 @@ private: static Dictionary::Ptr MergeConfigUpdate(const ConfigDirInformation& config); static bool UpdateConfigDir(const ConfigDirInformation& oldConfig, const ConfigDirInformation& newConfig, const String& configDir, bool authoritative); - void SyncZoneDirs(void) const; + void SyncZoneDirs() const; void SyncZoneDir(const Zone::Ptr& zone) const; static void ConfigGlobHandler(ConfigDirInformation& config, const String& path, const String& file); diff --git a/lib/remote/authority.cpp b/lib/remote/authority.cpp index 70aadfc03..ecb24ea70 100644 --- a/lib/remote/authority.cpp +++ b/lib/remote/authority.cpp @@ -24,7 +24,7 @@ using namespace icinga; -void ApiListener::UpdateObjectAuthority(void) +void ApiListener::UpdateObjectAuthority() { Zone::Ptr my_zone = Zone::GetLocalZone(); diff --git a/lib/remote/configobjectutility.cpp b/lib/remote/configobjectutility.cpp index 5207e515b..224c70fab 100644 --- a/lib/remote/configobjectutility.cpp +++ b/lib/remote/configobjectutility.cpp @@ -32,7 +32,7 @@ using namespace icinga; -String ConfigObjectUtility::GetConfigDir(void) +String ConfigObjectUtility::GetConfigDir() { return ConfigPackageUtility::GetPackageDir() + "/_api/" + ConfigPackageUtility::GetActiveStage("_api"); diff --git a/lib/remote/configobjectutility.hpp b/lib/remote/configobjectutility.hpp index fd27b530c..ea42ff3f2 100644 --- a/lib/remote/configobjectutility.hpp +++ b/lib/remote/configobjectutility.hpp @@ -38,7 +38,7 @@ class ConfigObjectUtility { public: - static String GetConfigDir(void); + static String GetConfigDir(); static String GetObjectConfigPath(const Type::Ptr& type, const String& fullName); static String CreateObjectConfig(const Type::Ptr& type, const String& fullName, diff --git a/lib/remote/configpackageutility.cpp b/lib/remote/configpackageutility.cpp index 4f1910a87..889404491 100644 --- a/lib/remote/configpackageutility.cpp +++ b/lib/remote/configpackageutility.cpp @@ -29,7 +29,7 @@ using namespace icinga; -String ConfigPackageUtility::GetPackageDir(void) +String ConfigPackageUtility::GetPackageDir() { return Application::GetLocalStateDir() + "/lib/icinga2/api/packages"; } @@ -56,7 +56,7 @@ void ConfigPackageUtility::DeletePackage(const String& name) Application::RequestRestart(); } -std::vector ConfigPackageUtility::GetPackages(void) +std::vector ConfigPackageUtility::GetPackages() { std::vector packages; Utility::Glob(GetPackageDir() + "/*", std::bind(&ConfigPackageUtility::CollectDirNames, @@ -319,7 +319,7 @@ bool ConfigPackageUtility::ValidateName(const String& name) return (!boost::regex_search(name.GetData(), what, expr)); } -boost::mutex& ConfigPackageUtility::GetStaticMutex(void) +boost::mutex& ConfigPackageUtility::GetStaticMutex() { static boost::mutex mutex; return mutex; diff --git a/lib/remote/configpackageutility.hpp b/lib/remote/configpackageutility.hpp index f877af5f0..bea1a5a51 100644 --- a/lib/remote/configpackageutility.hpp +++ b/lib/remote/configpackageutility.hpp @@ -39,11 +39,11 @@ class ConfigPackageUtility { public: - static String GetPackageDir(void); + static String GetPackageDir(); static void CreatePackage(const String& name); static void DeletePackage(const String& name); - static std::vector GetPackages(void); + static std::vector GetPackages(); static bool PackageExists(const String& name); static String CreateStage(const String& packageName, const Dictionary::Ptr& files = nullptr); @@ -58,7 +58,7 @@ public: static bool ContainsDotDot(const String& path); static bool ValidateName(const String& name); - static boost::mutex& GetStaticMutex(void); + static boost::mutex& GetStaticMutex(); private: static void CollectDirNames(const String& path, std::vector& dirs); diff --git a/lib/remote/consolehandler.cpp b/lib/remote/consolehandler.cpp index 1f32bb725..13f957b96 100644 --- a/lib/remote/consolehandler.cpp +++ b/lib/remote/consolehandler.cpp @@ -41,7 +41,7 @@ static std::map l_ApiScriptFrames; static Timer::Ptr l_FrameCleanupTimer; static boost::mutex l_ApiScriptMutex; -static void ScriptFrameCleanupHandler(void) +static void ScriptFrameCleanupHandler() { boost::mutex::scoped_lock lock(l_ApiScriptMutex); @@ -58,7 +58,7 @@ static void ScriptFrameCleanupHandler(void) l_ApiScriptFrames.erase(key); } -static void EnsureFrameCleanupTimer(void) +static void EnsureFrameCleanupTimer() { static boost::once_flag once = BOOST_ONCE_INIT; diff --git a/lib/remote/consolehandler.hpp b/lib/remote/consolehandler.hpp index 5d5cab9ac..726543faa 100644 --- a/lib/remote/consolehandler.hpp +++ b/lib/remote/consolehandler.hpp @@ -33,7 +33,7 @@ struct ApiScriptFrame std::map Lines; Dictionary::Ptr Locals; - ApiScriptFrame(void) + ApiScriptFrame() : Seen(0), NextLine(1) { } }; diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp index 5d8929432..2facf67b3 100644 --- a/lib/remote/endpoint.cpp +++ b/lib/remote/endpoint.cpp @@ -34,11 +34,11 @@ REGISTER_TYPE(Endpoint); boost::signals2::signal Endpoint::OnConnected; boost::signals2::signal Endpoint::OnDisconnected; -Endpoint::Endpoint(void) +Endpoint::Endpoint() : m_MessagesSent(60), m_MessagesReceived(60), m_BytesSent(60), m_BytesReceived(60) { } -void Endpoint::OnAllConfigLoaded(void) +void Endpoint::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -95,24 +95,24 @@ void Endpoint::RemoveClient(const JsonRpcConnection::Ptr& client) OnDisconnected(this, client); } -std::set Endpoint::GetClients(void) const +std::set Endpoint::GetClients() const { boost::mutex::scoped_lock lock(m_ClientsLock); return m_Clients; } -Zone::Ptr Endpoint::GetZone(void) const +Zone::Ptr Endpoint::GetZone() const { return m_Zone; } -bool Endpoint::GetConnected(void) const +bool Endpoint::GetConnected() const { boost::mutex::scoped_lock lock(m_ClientsLock); return !m_Clients.empty(); } -Endpoint::Ptr Endpoint::GetLocalEndpoint(void) +Endpoint::Ptr Endpoint::GetLocalEndpoint() { ApiListener::Ptr listener = ApiListener::GetInstance(); @@ -138,22 +138,22 @@ void Endpoint::AddMessageReceived(int bytes) SetLastMessageReceived(time); } -double Endpoint::GetMessagesSentPerSecond(void) const +double Endpoint::GetMessagesSentPerSecond() const { return m_MessagesSent.CalculateRate(Utility::GetTime(), 60); } -double Endpoint::GetMessagesReceivedPerSecond(void) const +double Endpoint::GetMessagesReceivedPerSecond() const { return m_MessagesReceived.CalculateRate(Utility::GetTime(), 60); } -double Endpoint::GetBytesSentPerSecond(void) const +double Endpoint::GetBytesSentPerSecond() const { return m_BytesSent.CalculateRate(Utility::GetTime(), 60); } -double Endpoint::GetBytesReceivedPerSecond(void) const +double Endpoint::GetBytesReceivedPerSecond() const { return m_BytesReceived.CalculateRate(Utility::GetTime(), 60); } diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp index 18d4c76f5..37420a511 100644 --- a/lib/remote/endpoint.hpp +++ b/lib/remote/endpoint.hpp @@ -42,34 +42,34 @@ public: DECLARE_OBJECT(Endpoint); DECLARE_OBJECTNAME(Endpoint); - Endpoint(void); + Endpoint(); static boost::signals2::signal&)> OnConnected; static boost::signals2::signal&)> OnDisconnected; void AddClient(const intrusive_ptr& client); void RemoveClient(const intrusive_ptr& client); - std::set > GetClients(void) const; + std::set > GetClients() const; - intrusive_ptr GetZone(void) const; + intrusive_ptr GetZone() const; - virtual bool GetConnected(void) const override; + virtual bool GetConnected() const override; - static Endpoint::Ptr GetLocalEndpoint(void); + static Endpoint::Ptr GetLocalEndpoint(); void SetCachedZone(const intrusive_ptr& zone); void AddMessageSent(int bytes); void AddMessageReceived(int bytes); - double GetMessagesSentPerSecond(void) const override; - double GetMessagesReceivedPerSecond(void) const override; + double GetMessagesSentPerSecond() const override; + double GetMessagesReceivedPerSecond() const override; - double GetBytesSentPerSecond(void) const override; - double GetBytesReceivedPerSecond(void) const override; + double GetBytesSentPerSecond() const override; + double GetBytesReceivedPerSecond() const override; protected: - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; private: mutable boost::mutex m_ClientsLock; diff --git a/lib/remote/eventqueue.cpp b/lib/remote/eventqueue.cpp index 105a448d7..965f71092 100644 --- a/lib/remote/eventqueue.cpp +++ b/lib/remote/eventqueue.cpp @@ -143,7 +143,7 @@ void EventQueue::Unregister(const String& name) EventQueueRegistry::GetInstance()->Unregister(name); } -EventQueueRegistry *EventQueueRegistry::GetInstance(void) +EventQueueRegistry *EventQueueRegistry::GetInstance() { return Singleton::GetInstance(); } diff --git a/lib/remote/eventqueue.hpp b/lib/remote/eventqueue.hpp index a2f7ece71..b6b4f3a48 100644 --- a/lib/remote/eventqueue.hpp +++ b/lib/remote/eventqueue.hpp @@ -76,7 +76,7 @@ private: class EventQueueRegistry : public Registry { public: - static EventQueueRegistry *GetInstance(void); + static EventQueueRegistry *GetInstance(); }; } diff --git a/lib/remote/httpclientconnection.cpp b/lib/remote/httpclientconnection.cpp index d6e24d206..20ab83a63 100644 --- a/lib/remote/httpclientconnection.cpp +++ b/lib/remote/httpclientconnection.cpp @@ -35,12 +35,12 @@ HttpClientConnection::HttpClientConnection(const String& host, const String& por : m_Host(host), m_Port(port), m_Tls(tls) { } -void HttpClientConnection::Start(void) +void HttpClientConnection::Start() { /* Nothing to do here atm. */ } -void HttpClientConnection::Reconnect(void) +void HttpClientConnection::Reconnect() { if (m_Stream) m_Stream->Close(); @@ -68,34 +68,34 @@ void HttpClientConnection::Reconnect(void) DataAvailableHandler(m_Stream); } -Stream::Ptr HttpClientConnection::GetStream(void) const +Stream::Ptr HttpClientConnection::GetStream() const { return m_Stream; } -String HttpClientConnection::GetHost(void) const +String HttpClientConnection::GetHost() const { return m_Host; } -String HttpClientConnection::GetPort(void) const +String HttpClientConnection::GetPort() const { return m_Port; } -bool HttpClientConnection::GetTls(void) const +bool HttpClientConnection::GetTls() const { return m_Tls; } -void HttpClientConnection::Disconnect(void) +void HttpClientConnection::Disconnect() { Log(LogDebug, "HttpClientConnection", "Http client disconnected"); m_Stream->Shutdown(); } -bool HttpClientConnection::ProcessMessage(void) +bool HttpClientConnection::ProcessMessage() { bool res; @@ -161,7 +161,7 @@ void HttpClientConnection::DataAvailableHandler(const Stream::Ptr& stream) m_Stream->Close(); } -std::shared_ptr HttpClientConnection::NewRequest(void) +std::shared_ptr HttpClientConnection::NewRequest() { Reconnect(); return std::make_shared(m_Stream); diff --git a/lib/remote/httpclientconnection.hpp b/lib/remote/httpclientconnection.hpp index 87e1dc948..9b379e5a5 100644 --- a/lib/remote/httpclientconnection.hpp +++ b/lib/remote/httpclientconnection.hpp @@ -41,16 +41,16 @@ public: HttpClientConnection(const String& host, const String& port, bool tls = true); - void Start(void); + void Start(); - Stream::Ptr GetStream(void) const; - String GetHost(void) const; - String GetPort(void) const; - bool GetTls(void) const; + Stream::Ptr GetStream() const; + String GetHost() const; + String GetPort() const; + bool GetTls() const; - void Disconnect(void); + void Disconnect(); - std::shared_ptr NewRequest(void); + std::shared_ptr NewRequest(); typedef std::function HttpCompletionCallback; void SubmitRequest(const std::shared_ptr& request, const HttpCompletionCallback& callback); @@ -66,8 +66,8 @@ private: StreamReadContext m_Context; - void Reconnect(void); - bool ProcessMessage(void); + void Reconnect(); + bool ProcessMessage(); void DataAvailableHandler(const Stream::Ptr& stream); void ProcessMessageAsync(HttpRequest& request); diff --git a/lib/remote/httprequest.cpp b/lib/remote/httprequest.cpp index 8cd0dfa79..e30d4e9ad 100644 --- a/lib/remote/httprequest.cpp +++ b/lib/remote/httprequest.cpp @@ -161,7 +161,7 @@ void HttpRequest::AddHeader(const String& key, const String& value) Headers->Set(key.ToLower(), value); } -void HttpRequest::FinishHeaders(void) +void HttpRequest::FinishHeaders() { if (m_State == HttpRequestStart) { String rqline = RequestMethod + " " + RequestUrl->Format(true) + " HTTP/1." + (ProtocolVersion == HttpVersion10 ? "0" : "1") + "\n"; @@ -207,7 +207,7 @@ void HttpRequest::WriteBody(const char *data, size_t count) } } -void HttpRequest::Finish(void) +void HttpRequest::Finish() { ASSERT(m_State != HttpRequestEnd); diff --git a/lib/remote/httprequest.hpp b/lib/remote/httprequest.hpp index 18a11c602..258bacdb7 100644 --- a/lib/remote/httprequest.hpp +++ b/lib/remote/httprequest.hpp @@ -67,7 +67,7 @@ public: void AddHeader(const String& key, const String& value); void WriteBody(const char *data, size_t count); - void Finish(void); + void Finish(); private: Stream::Ptr m_Stream; @@ -75,7 +75,7 @@ private: HttpRequestState m_State; FIFO::Ptr m_Body; - void FinishHeaders(void); + void FinishHeaders(); }; } diff --git a/lib/remote/httpresponse.cpp b/lib/remote/httpresponse.cpp index 81cce76cc..373d088e0 100644 --- a/lib/remote/httpresponse.cpp +++ b/lib/remote/httpresponse.cpp @@ -60,7 +60,7 @@ void HttpResponse::AddHeader(const String& key, const String& value) m_Headers.emplace_back(key + ": " + value + "\r\n"); } -void HttpResponse::FinishHeaders(void) +void HttpResponse::FinishHeaders() { if (m_State == HttpResponseHeaders) { if (m_Request.ProtocolVersion == HttpVersion11) @@ -92,7 +92,7 @@ void HttpResponse::WriteBody(const char *data, size_t count) } } -void HttpResponse::Finish(void) +void HttpResponse::Finish() { ASSERT(m_State != HttpResponseEnd); @@ -249,7 +249,7 @@ size_t HttpResponse::ReadBody(char *data, size_t count) return m_Body->Read(data, count, true); } -size_t HttpResponse::GetBodySize(void) const +size_t HttpResponse::GetBodySize() const { if (!m_Body) return 0; @@ -257,7 +257,7 @@ size_t HttpResponse::GetBodySize(void) const return m_Body->GetAvailableBytes(); } -bool HttpResponse::IsPeerConnected(void) const +bool HttpResponse::IsPeerConnected() const { return !m_Stream->IsEof(); } diff --git a/lib/remote/httpresponse.hpp b/lib/remote/httpresponse.hpp index 6a876d342..98e740a86 100644 --- a/lib/remote/httpresponse.hpp +++ b/lib/remote/httpresponse.hpp @@ -56,14 +56,14 @@ public: bool Parse(StreamReadContext& src, bool may_wait); size_t ReadBody(char *data, size_t count); - size_t GetBodySize(void) const; + size_t GetBodySize() const; void SetStatus(int code, const String& message); void AddHeader(const String& key, const String& value); void WriteBody(const char *data, size_t count); - void Finish(void); + void Finish(); - bool IsPeerConnected(void) const; + bool IsPeerConnected() const; private: HttpResponseState m_State; @@ -73,7 +73,7 @@ private: FIFO::Ptr m_Body; std::vector m_Headers; - void FinishHeaders(void); + void FinishHeaders(); }; } diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp index 85922c2bd..abc5a23b2 100644 --- a/lib/remote/httpserverconnection.cpp +++ b/lib/remote/httpserverconnection.cpp @@ -48,7 +48,7 @@ HttpServerConnection::HttpServerConnection(const String& identity, bool authenti m_ApiUser = ApiUser::GetByClientCN(identity); } -void HttpServerConnection::StaticInitialize(void) +void HttpServerConnection::StaticInitialize() { l_HttpServerConnectionTimeoutTimer = new Timer(); l_HttpServerConnectionTimeoutTimer->OnTimerExpired.connect(std::bind(&HttpServerConnection::TimeoutTimerHandler)); @@ -56,7 +56,7 @@ void HttpServerConnection::StaticInitialize(void) l_HttpServerConnectionTimeoutTimer->Start(); } -void HttpServerConnection::Start(void) +void HttpServerConnection::Start() { /* the stream holds an owning reference to this object through the callback we're registering here */ m_Stream->RegisterDataHandler(std::bind(&HttpServerConnection::DataAvailableHandler, HttpServerConnection::Ptr(this))); @@ -64,17 +64,17 @@ void HttpServerConnection::Start(void) DataAvailableHandler(); } -ApiUser::Ptr HttpServerConnection::GetApiUser(void) const +ApiUser::Ptr HttpServerConnection::GetApiUser() const { return m_ApiUser; } -TlsStream::Ptr HttpServerConnection::GetStream(void) const +TlsStream::Ptr HttpServerConnection::GetStream() const { return m_Stream; } -void HttpServerConnection::Disconnect(void) +void HttpServerConnection::Disconnect() { Log(LogDebug, "HttpServerConnection", "Http client disconnected"); @@ -87,7 +87,7 @@ void HttpServerConnection::Disconnect(void) m_Stream->Close(); } -bool HttpServerConnection::ProcessMessage(void) +bool HttpServerConnection::ProcessMessage() { bool res; @@ -266,7 +266,7 @@ void HttpServerConnection::ProcessMessageAsync(HttpRequest& request) m_PendingRequests--; } -void HttpServerConnection::DataAvailableHandler(void) +void HttpServerConnection::DataAvailableHandler() { bool close = false; @@ -289,7 +289,7 @@ void HttpServerConnection::DataAvailableHandler(void) Disconnect(); } -void HttpServerConnection::CheckLiveness(void) +void HttpServerConnection::CheckLiveness() { if (m_Seen < Utility::GetTime() - 10 && m_PendingRequests == 0) { Log(LogInformation, "HttpServerConnection") @@ -298,7 +298,7 @@ void HttpServerConnection::CheckLiveness(void) } } -void HttpServerConnection::TimeoutTimerHandler(void) +void HttpServerConnection::TimeoutTimerHandler() { ApiListener::Ptr listener = ApiListener::GetInstance(); diff --git a/lib/remote/httpserverconnection.hpp b/lib/remote/httpserverconnection.hpp index a89dc6016..f52110013 100644 --- a/lib/remote/httpserverconnection.hpp +++ b/lib/remote/httpserverconnection.hpp @@ -41,13 +41,13 @@ public: HttpServerConnection(const String& identity, bool authenticated, const TlsStream::Ptr& stream); - void Start(void); + void Start(); - ApiUser::Ptr GetApiUser(void) const; - bool IsAuthenticated(void) const; - TlsStream::Ptr GetStream(void) const; + ApiUser::Ptr GetApiUser() const; + bool IsAuthenticated() const; + TlsStream::Ptr GetStream() const; - void Disconnect(void); + void Disconnect(); private: ApiUser::Ptr m_ApiUser; @@ -60,12 +60,12 @@ private: StreamReadContext m_Context; - bool ProcessMessage(void); - void DataAvailableHandler(void); + bool ProcessMessage(); + void DataAvailableHandler(); - static void StaticInitialize(void); - static void TimeoutTimerHandler(void); - void CheckLiveness(void); + static void StaticInitialize(); + static void TimeoutTimerHandler(); + void CheckLiveness(); void ProcessMessageAsync(HttpRequest& request); }; diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp index 6718f00cb..94bd9cb5b 100644 --- a/lib/remote/jsonrpc.cpp +++ b/lib/remote/jsonrpc.cpp @@ -28,7 +28,7 @@ using namespace icinga; #ifdef I2_DEBUG -static bool GetDebugJsonRpcCached(void) +static bool GetDebugJsonRpcCached() { static int debugJsonRpc = -1; diff --git a/lib/remote/jsonrpc.hpp b/lib/remote/jsonrpc.hpp index 1033086e4..1d3232f95 100644 --- a/lib/remote/jsonrpc.hpp +++ b/lib/remote/jsonrpc.hpp @@ -40,7 +40,7 @@ public: static Dictionary::Ptr DecodeMessage(const String& message); private: - JsonRpc(void); + JsonRpc(); }; } diff --git a/lib/remote/jsonrpcconnection-heartbeat.cpp b/lib/remote/jsonrpcconnection-heartbeat.cpp index 32cf0b9bd..349103a19 100644 --- a/lib/remote/jsonrpcconnection-heartbeat.cpp +++ b/lib/remote/jsonrpcconnection-heartbeat.cpp @@ -29,7 +29,7 @@ using namespace icinga; REGISTER_APIFUNCTION(Heartbeat, event, &JsonRpcConnection::HeartbeatAPIHandler); -void JsonRpcConnection::HeartbeatTimerHandler(void) +void JsonRpcConnection::HeartbeatTimerHandler() { for (const Endpoint::Ptr& endpoint : ConfigType::GetObjectsByType()) { for (const JsonRpcConnection::Ptr& client : endpoint->GetClients()) { diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp index 8d96f516d..4f4977f28 100644 --- a/lib/remote/jsonrpcconnection.cpp +++ b/lib/remote/jsonrpcconnection.cpp @@ -52,7 +52,7 @@ JsonRpcConnection::JsonRpcConnection(const String& identity, bool authenticated, m_Endpoint = Endpoint::GetByName(identity); } -void JsonRpcConnection::StaticInitialize(void) +void JsonRpcConnection::StaticInitialize() { l_JsonRpcConnectionTimeoutTimer = new Timer(); l_JsonRpcConnectionTimeoutTimer->OnTimerExpired.connect(std::bind(&JsonRpcConnection::TimeoutTimerHandler)); @@ -72,7 +72,7 @@ void JsonRpcConnection::StaticInitialize(void) l_HeartbeatTimer->Start(); } -void JsonRpcConnection::Start(void) +void JsonRpcConnection::Start() { /* the stream holds an owning reference to this object through the callback we're registering here */ m_Stream->RegisterDataHandler(std::bind(&JsonRpcConnection::DataAvailableHandler, JsonRpcConnection::Ptr(this))); @@ -80,32 +80,32 @@ void JsonRpcConnection::Start(void) DataAvailableHandler(); } -double JsonRpcConnection::GetTimestamp(void) const +double JsonRpcConnection::GetTimestamp() const { return m_Timestamp; } -String JsonRpcConnection::GetIdentity(void) const +String JsonRpcConnection::GetIdentity() const { return m_Identity; } -bool JsonRpcConnection::IsAuthenticated(void) const +bool JsonRpcConnection::IsAuthenticated() const { return m_Authenticated; } -Endpoint::Ptr JsonRpcConnection::GetEndpoint(void) const +Endpoint::Ptr JsonRpcConnection::GetEndpoint() const { return m_Endpoint; } -TlsStream::Ptr JsonRpcConnection::GetStream(void) const +TlsStream::Ptr JsonRpcConnection::GetStream() const { return m_Stream; } -ConnectionRole JsonRpcConnection::GetRole(void) const +ConnectionRole JsonRpcConnection::GetRole() const { return m_Role; } @@ -128,7 +128,7 @@ void JsonRpcConnection::SendMessage(const Dictionary::Ptr& message) } } -void JsonRpcConnection::Disconnect(void) +void JsonRpcConnection::Disconnect() { Log(LogWarning, "JsonRpcConnection") << "API client disconnected for identity '" << m_Identity << "'"; @@ -237,7 +237,7 @@ void JsonRpcConnection::MessageHandler(const String& jsonString) } } -bool JsonRpcConnection::ProcessMessage(void) +bool JsonRpcConnection::ProcessMessage() { String message; @@ -251,7 +251,7 @@ bool JsonRpcConnection::ProcessMessage(void) return true; } -void JsonRpcConnection::DataAvailableHandler(void) +void JsonRpcConnection::DataAvailableHandler() { bool close = false; @@ -297,7 +297,7 @@ Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary:: return Empty; } -void JsonRpcConnection::CheckLiveness(void) +void JsonRpcConnection::CheckLiveness() { if (m_Seen < Utility::GetTime() - 60 && (!m_Endpoint || !m_Endpoint->GetSyncing())) { Log(LogInformation, "JsonRpcConnection") @@ -306,7 +306,7 @@ void JsonRpcConnection::CheckLiveness(void) } } -void JsonRpcConnection::TimeoutTimerHandler(void) +void JsonRpcConnection::TimeoutTimerHandler() { ApiListener::Ptr listener = ApiListener::GetInstance(); @@ -321,12 +321,12 @@ void JsonRpcConnection::TimeoutTimerHandler(void) } } -size_t JsonRpcConnection::GetWorkQueueCount(void) +size_t JsonRpcConnection::GetWorkQueueCount() { return l_JsonRpcConnectionWorkQueueCount; } -size_t JsonRpcConnection::GetWorkQueueLength(void) +size_t JsonRpcConnection::GetWorkQueueLength() { size_t itemCount = 0; @@ -336,7 +336,7 @@ size_t JsonRpcConnection::GetWorkQueueLength(void) return itemCount; } -double JsonRpcConnection::GetWorkQueueRate(void) +double JsonRpcConnection::GetWorkQueueRate() { double rate = 0.0; size_t count = GetWorkQueueCount(); diff --git a/lib/remote/jsonrpcconnection.hpp b/lib/remote/jsonrpcconnection.hpp index 6febfc56d..462ef627c 100644 --- a/lib/remote/jsonrpcconnection.hpp +++ b/lib/remote/jsonrpcconnection.hpp @@ -55,25 +55,25 @@ public: JsonRpcConnection(const String& identity, bool authenticated, const TlsStream::Ptr& stream, ConnectionRole role); - void Start(void); + void Start(); - double GetTimestamp(void) const; - String GetIdentity(void) const; - bool IsAuthenticated(void) const; - Endpoint::Ptr GetEndpoint(void) const; - TlsStream::Ptr GetStream(void) const; - ConnectionRole GetRole(void) const; + double GetTimestamp() const; + String GetIdentity() const; + bool IsAuthenticated() const; + Endpoint::Ptr GetEndpoint() const; + TlsStream::Ptr GetStream() const; + ConnectionRole GetRole() const; - void Disconnect(void); + void Disconnect(); void SendMessage(const Dictionary::Ptr& request); - static void HeartbeatTimerHandler(void); + static void HeartbeatTimerHandler(); static Value HeartbeatAPIHandler(const intrusive_ptr& origin, const Dictionary::Ptr& params); - static size_t GetWorkQueueCount(void); - static size_t GetWorkQueueLength(void); - static double GetWorkQueueRate(void); + static size_t GetWorkQueueCount(); + static size_t GetWorkQueueLength(); + static double GetWorkQueueRate(); static void SendCertificateRequest(const JsonRpcConnection::Ptr& aclient, const intrusive_ptr& origin, const String& path); @@ -92,14 +92,14 @@ private: StreamReadContext m_Context; - bool ProcessMessage(void); + bool ProcessMessage(); void MessageHandlerWrapper(const String& jsonString); void MessageHandler(const String& jsonString); - void DataAvailableHandler(void); + void DataAvailableHandler(); - static void StaticInitialize(void); - static void TimeoutTimerHandler(void); - void CheckLiveness(void); + static void StaticInitialize(); + static void TimeoutTimerHandler(); + void CheckLiveness(); void CertificateRequestResponseHandler(const Dictionary::Ptr& message); }; diff --git a/lib/remote/messageorigin.cpp b/lib/remote/messageorigin.cpp index c8844cfe7..184038497 100644 --- a/lib/remote/messageorigin.cpp +++ b/lib/remote/messageorigin.cpp @@ -21,7 +21,7 @@ using namespace icinga; -bool MessageOrigin::IsLocal(void) const +bool MessageOrigin::IsLocal() const { return !FromClient; } diff --git a/lib/remote/messageorigin.hpp b/lib/remote/messageorigin.hpp index a12d8e9c3..71be262fe 100644 --- a/lib/remote/messageorigin.hpp +++ b/lib/remote/messageorigin.hpp @@ -37,7 +37,7 @@ public: Zone::Ptr FromZone; JsonRpcConnection::Ptr FromClient; - bool IsLocal(void) const; + bool IsLocal() const; }; } diff --git a/lib/remote/pkiutility.cpp b/lib/remote/pkiutility.cpp index b6b7e7047..2d3232d2e 100644 --- a/lib/remote/pkiutility.cpp +++ b/lib/remote/pkiutility.cpp @@ -34,7 +34,7 @@ using namespace icinga; -int PkiUtility::NewCa(void) +int PkiUtility::NewCa() { String caDir = ApiListener::GetCaDir(); String caCertFile = caDir + "/ca.crt"; @@ -424,7 +424,7 @@ static void CollectRequestHandler(const Dictionary::Ptr& requests, const String& requests->Set(fingerprint, result); } -Dictionary::Ptr PkiUtility::GetCertificateRequests(void) +Dictionary::Ptr PkiUtility::GetCertificateRequests() { Dictionary::Ptr requests = new Dictionary(); diff --git a/lib/remote/pkiutility.hpp b/lib/remote/pkiutility.hpp index 5cd98eb5e..500b7be69 100644 --- a/lib/remote/pkiutility.hpp +++ b/lib/remote/pkiutility.hpp @@ -34,7 +34,7 @@ namespace icinga class PkiUtility { public: - static int NewCa(void); + static int NewCa(); static int NewCert(const String& cn, const String& keyfile, const String& csrfile, const String& certfile); static int SignCsr(const String& csrfile, const String& certfile); static std::shared_ptr FetchCert(const String& host, const String& port); @@ -44,10 +44,10 @@ public: const String& certfile, const String& cafile, const std::shared_ptr& trustedcert, const String& ticket = String()); static String GetCertificateInformation(const std::shared_ptr& certificate); - static Dictionary::Ptr GetCertificateRequests(void); + static Dictionary::Ptr GetCertificateRequests(); private: - PkiUtility(void); + PkiUtility(); }; diff --git a/lib/remote/url.cpp b/lib/remote/url.cpp index 98d060ced..f7e068f8c 100644 --- a/lib/remote/url.cpp +++ b/lib/remote/url.cpp @@ -90,12 +90,12 @@ Url::Url(const String& base_url) } } -String Url::GetScheme(void) const +String Url::GetScheme() const { return m_Scheme; } -String Url::GetAuthority(void) const +String Url::GetAuthority() const { if (m_Host.IsEmpty()) return ""; @@ -116,32 +116,32 @@ String Url::GetAuthority(void) const return auth; } -String Url::GetUsername(void) const +String Url::GetUsername() const { return m_Username; } -String Url::GetPassword(void) const +String Url::GetPassword() const { return m_Password; } -String Url::GetHost(void) const +String Url::GetHost() const { return m_Host; } -String Url::GetPort(void) const +String Url::GetPort() const { return m_Port; } -const std::vector& Url::GetPath(void) const +const std::vector& Url::GetPath() const { return m_Path; } -const std::map >& Url::GetQuery(void) const +const std::map >& Url::GetQuery() const { return m_Query; } @@ -168,7 +168,7 @@ const std::vector& Url::GetQueryElements(const String& name) const return it->second; } -String Url::GetFragment(void) const +String Url::GetFragment() const { return m_Fragment; } diff --git a/lib/remote/url.hpp b/lib/remote/url.hpp index 5bbe6ac18..29a7c1fbd 100644 --- a/lib/remote/url.hpp +++ b/lib/remote/url.hpp @@ -46,17 +46,17 @@ public: String Format(bool onlyPathAndQuery = false, bool printCredentials = false) const; - String GetScheme(void) const; - String GetAuthority(void) const; - String GetUsername(void) const; - String GetPassword(void) const; - String GetHost(void) const; - String GetPort(void) const; - const std::vector& GetPath(void) const; - const std::map >& GetQuery(void) const; + String GetScheme() const; + String GetAuthority() const; + String GetUsername() const; + String GetPassword() const; + String GetHost() const; + String GetPort() const; + const std::vector& GetPath() const; + const std::map >& GetQuery() const; String GetQueryElement(const String& name) const; const std::vector& GetQueryElements(const String& name) const; - String GetFragment(void) const; + String GetFragment() const; void SetScheme(const String& scheme); void SetUsername(const String& username); diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp index b0f747e75..c171c78f4 100644 --- a/lib/remote/zone.cpp +++ b/lib/remote/zone.cpp @@ -27,7 +27,7 @@ using namespace icinga; REGISTER_TYPE(Zone); -void Zone::OnAllConfigLoaded(void) +void Zone::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); @@ -59,12 +59,12 @@ void Zone::OnAllConfigLoaded(void) } } -Zone::Ptr Zone::GetParent(void) const +Zone::Ptr Zone::GetParent() const { return m_Parent; } -std::set Zone::GetEndpoints(void) const +std::set Zone::GetEndpoints() const { std::set result; @@ -86,7 +86,7 @@ std::set Zone::GetEndpoints(void) const return result; } -std::vector Zone::GetAllParents(void) const +std::vector Zone::GetAllParents() const { return m_AllParents; } @@ -123,18 +123,18 @@ bool Zone::IsChildOf(const Zone::Ptr& zone) return false; } -bool Zone::IsGlobal(void) const +bool Zone::IsGlobal() const { return GetGlobal(); } -bool Zone::IsSingleInstance(void) const +bool Zone::IsSingleInstance() const { Array::Ptr endpoints = GetEndpointsRaw(); return !endpoints || endpoints->GetLength() < 2; } -Zone::Ptr Zone::GetLocalZone(void) +Zone::Ptr Zone::GetLocalZone() { Endpoint::Ptr local = Endpoint::GetLocalEndpoint(); diff --git a/lib/remote/zone.hpp b/lib/remote/zone.hpp index 7c4254ad7..83022a30f 100644 --- a/lib/remote/zone.hpp +++ b/lib/remote/zone.hpp @@ -36,18 +36,18 @@ public: DECLARE_OBJECT(Zone); DECLARE_OBJECTNAME(Zone); - virtual void OnAllConfigLoaded(void) override; + virtual void OnAllConfigLoaded() override; - Zone::Ptr GetParent(void) const; - std::set GetEndpoints(void) const; - std::vector GetAllParents(void) const; + Zone::Ptr GetParent() const; + std::set GetEndpoints() const; + std::vector GetAllParents() const; bool CanAccessObject(const ConfigObject::Ptr& object); bool IsChildOf(const Zone::Ptr& zone); - bool IsGlobal(void) const; - bool IsSingleInstance(void) const; + bool IsGlobal() const; + bool IsSingleInstance() const; - static Zone::Ptr GetLocalZone(void); + static Zone::Ptr GetLocalZone(); protected: virtual void ValidateEndpointsRaw(const Array::Ptr& value, const ValidationUtils& utils) override; diff --git a/test/base-object.cpp b/test/base-object.cpp index 9949611d8..e81c5bb38 100644 --- a/test/base-object.cpp +++ b/test/base-object.cpp @@ -28,7 +28,7 @@ class TestObject : public Object public: DECLARE_PTR_TYPEDEFS(TestObject); - TestObject::Ptr GetTestRef(void) + TestObject::Ptr GetTestRef() { return this; } diff --git a/test/icinga-checkable-fixture.cpp b/test/icinga-checkable-fixture.cpp index 9178f85a5..e3e68966a 100644 --- a/test/icinga-checkable-fixture.cpp +++ b/test/icinga-checkable-fixture.cpp @@ -27,14 +27,14 @@ using namespace icinga; struct IcingaCheckableFixture { - IcingaCheckableFixture(void) + IcingaCheckableFixture() { BOOST_TEST_MESSAGE("setup running Icinga 2 core"); Application::InitializeBase(); } - ~IcingaCheckableFixture(void) + ~IcingaCheckableFixture() { BOOST_TEST_MESSAGE("cleanup Icinga 2 core"); Application::UninitializeBase(); diff --git a/test/icinga-legacytimeperiod.cpp b/test/icinga-legacytimeperiod.cpp index cf5212b88..c02f10887 100644 --- a/test/icinga-legacytimeperiod.cpp +++ b/test/icinga-legacytimeperiod.cpp @@ -28,7 +28,7 @@ struct GlobalTimezoneFixture { char *tz; - GlobalTimezoneFixture(void) + GlobalTimezoneFixture() { tz = getenv("TZ"); #ifdef _WIN32 @@ -39,7 +39,7 @@ struct GlobalTimezoneFixture tzset(); } - ~GlobalTimezoneFixture(void) + ~GlobalTimezoneFixture() { #ifdef _WIN32 if (tz) diff --git a/test/livestatus-fixture.cpp b/test/livestatus-fixture.cpp index f2572cc9e..8007b159a 100644 --- a/test/livestatus-fixture.cpp +++ b/test/livestatus-fixture.cpp @@ -27,14 +27,14 @@ using namespace icinga; struct LivestatusFixture { - LivestatusFixture(void) + LivestatusFixture() { BOOST_TEST_MESSAGE("Preparing config objects..."); ConfigItem::RunWithActivationContext(new Function("CreateTestObjects", CreateTestObjects)); } - static void CreateTestObjects(void) + static void CreateTestObjects() { String config = R"CONFIG( object CheckCommand "dummy" { diff --git a/test/test-runner.cpp b/test/test-runner.cpp index 143d5e5ae..ea09e8744 100644 --- a/test/test-runner.cpp +++ b/test/test-runner.cpp @@ -23,7 +23,7 @@ using namespace icinga; -static bool init_unit_test(void) +static bool init_unit_test() { return true; } diff --git a/tools/mkclass/class_parser.yy b/tools/mkclass/class_parser.yy index 792b58a80..2165549eb 100644 --- a/tools/mkclass/class_parser.yy +++ b/tools/mkclass/class_parser.yy @@ -374,7 +374,7 @@ class_field: field_attribute_list field_type identifier alternative_name_specifi } | T_LOAD_AFTER identifier ';' { - Field *field = new Field(); + auto *field = new Field(); field->Attributes = FALoadDependency; field->Name = $2; std::free($2); diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 63f0f8ad0..62eb02e0f 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -42,17 +42,17 @@ ClassCompiler::ClassCompiler(const std::string& path, std::istream& input, InitializeScanner(); } -ClassCompiler::~ClassCompiler(void) +ClassCompiler::~ClassCompiler() { DestroyScanner(); } -std::string ClassCompiler::GetPath(void) const +std::string ClassCompiler::GetPath() const { return m_Path; } -void *ClassCompiler::GetScanner(void) +void *ClassCompiler::GetScanner() { return m_Scanner; } @@ -198,7 +198,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) m_Header << "template<>" << std::endl << "struct TypeHelper<" << klass.Name << ", " << ((klass.Attributes & TAVarArgConstructor) ? "true" : "false") << ">" << std::endl << "{" << std::endl - << "\t" << "static ObjectFactory GetFactory(void)" << std::endl + << "\t" << "static ObjectFactory GetFactory()" << std::endl << "\t" << "{" << std::endl << "\t\t" << "return nullptr;" << std::endl << "\t" << "}" << std::endl @@ -220,34 +220,34 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "{" << std::endl << "public:" << std::endl << "\t" << "DECLARE_PTR_TYPEDEFS(TypeImpl<" << klass.Name << ">);" << std::endl << std::endl - << "\t" << "TypeImpl(void);" << std::endl - << "\t" << "~TypeImpl(void);" << std::endl << std::endl; + << "\t" << "TypeImpl();" << std::endl + << "\t" << "~TypeImpl();" << std::endl << std::endl; - m_Impl << "TypeImpl<" << klass.Name << ">::TypeImpl(void)" << std::endl + m_Impl << "TypeImpl<" << klass.Name << ">::TypeImpl()" << std::endl << "{ }" << std::endl << std::endl - << "TypeImpl<" << klass.Name << ">::~TypeImpl(void)" << std::endl + << "TypeImpl<" << klass.Name << ">::~TypeImpl()" << std::endl << "{ }" << std::endl << std::endl; /* GetName */ - m_Header << "\t" << "virtual String GetName(void) const;" << std::endl; + m_Header << "\t" << "virtual String GetName() const;" << std::endl; - m_Impl << "String TypeImpl<" << klass.Name << ">::GetName(void) const" << std::endl + m_Impl << "String TypeImpl<" << klass.Name << ">::GetName() const" << std::endl << "{" << std::endl << "\t" << "return \"" << klass.Name << "\";" << std::endl << "}" << std::endl << std::endl; /* GetAttributes */ - m_Header << "\t" << "virtual int GetAttributes(void) const;" << std::endl; + m_Header << "\t" << "virtual int GetAttributes() const;" << std::endl; - m_Impl << "int TypeImpl<" << klass.Name << ">::GetAttributes(void) const" << std::endl + m_Impl << "int TypeImpl<" << klass.Name << ">::GetAttributes() const" << std::endl << "{" << std::endl << "\t" << "return " << klass.Attributes << ";" << std::endl << "}" << std::endl << std::endl; /* GetBaseType */ - m_Header << "\t" << "virtual Type::Ptr GetBaseType(void) const;" << std::endl; + m_Header << "\t" << "virtual Type::Ptr GetBaseType() const;" << std::endl; - m_Impl << "Type::Ptr TypeImpl<" << klass.Name << ">::GetBaseType(void) const" << std::endl + m_Impl << "Type::Ptr TypeImpl<" << klass.Name << ">::GetBaseType() const" << std::endl << "{" << std::endl << "\t" << "return "; @@ -374,9 +374,9 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) m_Impl << "}" << std::endl << std::endl; /* GetFieldCount */ - m_Header << "\t" << "virtual int GetFieldCount(void) const;" << std::endl; + m_Header << "\t" << "virtual int GetFieldCount() const;" << std::endl; - m_Impl << "int TypeImpl<" << klass.Name << ">::GetFieldCount(void) const" << std::endl + m_Impl << "int TypeImpl<" << klass.Name << ">::GetFieldCount() const" << std::endl << "{" << std::endl << "\t" << "return " << klass.Fields.size(); @@ -387,17 +387,17 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFactory */ - m_Header << "\t" << "virtual ObjectFactory GetFactory(void) const;" << std::endl; + m_Header << "\t" << "virtual ObjectFactory GetFactory() const;" << std::endl; - m_Impl << "ObjectFactory TypeImpl<" << klass.Name << ">::GetFactory(void) const" << std::endl + m_Impl << "ObjectFactory TypeImpl<" << klass.Name << ">::GetFactory() const" << std::endl << "{" << std::endl << "\t" << "return TypeHelper<" << klass.Name << ", " << ((klass.Attributes & TAVarArgConstructor) ? "true" : "false") << ">::GetFactory();" << std::endl << "}" << std::endl << std::endl; /* GetLoadDependencies */ - m_Header << "\t" << "virtual std::vector GetLoadDependencies(void) const;" << std::endl; + m_Header << "\t" << "virtual std::vector GetLoadDependencies() const;" << std::endl; - m_Impl << "std::vector TypeImpl<" << klass.Name << ">::GetLoadDependencies(void) const" << std::endl + m_Impl << "std::vector TypeImpl<" << klass.Name << ">::GetLoadDependencies() const" << std::endl << "{" << std::endl << "\t" << "std::vector deps;" << std::endl; @@ -550,9 +550,9 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* constructor */ m_Header << "public:" << std::endl - << "\t" << "ObjectImpl<" << klass.Name << ">(void);" << std::endl; + << "\t" << "ObjectImpl<" << klass.Name << ">();" << std::endl; - m_Impl << "ObjectImpl<" << klass.Name << ">::ObjectImpl(void)" << std::endl + m_Impl << "ObjectImpl<" << klass.Name << ">::ObjectImpl()" << std::endl << "{" << std::endl; for (const Field& field : klass.Fields) { @@ -563,9 +563,9 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* destructor */ m_Header << "public:" << std::endl - << "\t" << "~ObjectImpl<" << klass.Name << ">(void);" << std::endl; + << "\t" << "~ObjectImpl<" << klass.Name << ">();" << std::endl; - m_Impl << "ObjectImpl<" << klass.Name << ">::~ObjectImpl(void)" << std::endl + m_Impl << "ObjectImpl<" << klass.Name << ">::~ObjectImpl()" << std::endl << "{ }" << std::endl << std::endl; if (!klass.Fields.empty()) { @@ -790,14 +790,14 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) if (field.Attributes & FAGetVirtual || field.PureGetAccessor) m_Header << "virtual "; - m_Header << field.Type.GetRealType() << " Get" << field.GetFriendlyName() << "(void) const"; + m_Header << field.Type.GetRealType() << " Get" << field.GetFriendlyName() << "() const"; if (field.PureGetAccessor) { m_Header << " = 0;" << std::endl; } else { m_Header << ";" << std::endl; - m_Impl << field.Type.GetRealType() << " ObjectImpl<" << klass.Name << ">::Get" << field.GetFriendlyName() << "(void) const" << std::endl + m_Impl << field.Type.GetRealType() << " ObjectImpl<" << klass.Name << ">::Get" << field.GetFriendlyName() << "() const" << std::endl << "{" << std::endl; if (field.GetAccessor.empty() && !(field.Attributes & FANoStorage)) @@ -941,14 +941,14 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) continue; m_Header << "public:" << std::endl - << "\t" << "Object::Ptr Navigate" << field.GetFriendlyName() << "(void) const"; + << "\t" << "Object::Ptr Navigate" << field.GetFriendlyName() << "() const"; if (field.PureNavigateAccessor) { m_Header << " = 0;" << std::endl; } else { m_Header << ";" << std::endl; - m_Impl << "Object::Ptr ObjectImpl<" << klass.Name << ">::Navigate" << field.GetFriendlyName() << "(void) const" << std::endl + m_Impl << "Object::Ptr ObjectImpl<" << klass.Name << ">::Navigate" << field.GetFriendlyName() << "() const" << std::endl << "{" << std::endl; if (field.NavigateAccessor.empty()) @@ -1022,9 +1022,9 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) std::string realType = field.Type.GetRealType(); m_Header << "private:" << std::endl - << "\t" << "inline " << realType << " GetDefault" << field.GetFriendlyName() << "(void) const;" << std::endl; + << "\t" << "inline " << realType << " GetDefault" << field.GetFriendlyName() << "() const;" << std::endl; - m_Impl << realType << " ObjectImpl<" << klass.Name << ">::GetDefault" << field.GetFriendlyName() << "(void) const" << std::endl + m_Impl << realType << " ObjectImpl<" << klass.Name << ">::GetDefault" << field.GetFriendlyName() << "() const" << std::endl << "{" << std::endl; if (field.DefaultAccessor.empty()) @@ -1321,7 +1321,7 @@ void ClassCompiler::HandleValidator(const Validator& validator, const ClassDebug m_MissingValidators.clear(); } -void ClassCompiler::HandleMissingValidators(void) +void ClassCompiler::HandleMissingValidators() { for (const auto& it : m_MissingValidators) { m_Impl << "void ObjectImpl<" << it.first.first << ">::Validate" << it.first.second << "(" << it.second.Type.GetArgumentType() << " value, const ValidationUtils& utils)" << std::endl diff --git a/tools/mkclass/classcompiler.hpp b/tools/mkclass/classcompiler.hpp index b5e1fa8ff..f4b8f0ba9 100644 --- a/tools/mkclass/classcompiler.hpp +++ b/tools/mkclass/classcompiler.hpp @@ -84,11 +84,11 @@ struct FieldType std::string TypeName; int ArrayRank; - FieldType(void) + FieldType() : IsName(false), ArrayRank(0) { } - inline std::string GetRealType(void) const + inline std::string GetRealType() const { if (ArrayRank > 0) return "Array::Ptr"; @@ -99,7 +99,7 @@ struct FieldType return TypeName; } - inline std::string GetArgumentType(void) const + inline std::string GetArgumentType() const { std::string realType = GetRealType(); @@ -126,11 +126,11 @@ struct Field std::string NavigateAccessor; bool PureNavigateAccessor; - Field(void) + Field() : Attributes(0), PureGetAccessor(false), PureSetAccessor(false), PureNavigateAccessor(false) { } - inline std::string GetFriendlyName(void) const + inline std::string GetFriendlyName() const { if (!AlternativeName.empty()) return AlternativeName; @@ -208,16 +208,16 @@ class ClassCompiler { public: ClassCompiler(const std::string& path, std::istream& input, std::ostream& oimpl, std::ostream& oheader); - ~ClassCompiler(void); + ~ClassCompiler(); - void Compile(void); + void Compile(); - std::string GetPath(void) const; + std::string GetPath() const; - void InitializeScanner(void); - void DestroyScanner(void); + void InitializeScanner(); + void DestroyScanner(); - void *GetScanner(void); + void *GetScanner(); size_t ReadInput(char *buffer, size_t max_size); @@ -231,7 +231,7 @@ public: void HandleNamespaceEnd(const ClassDebugInfo& locp); void HandleCode(const std::string& code, const ClassDebugInfo& locp); void HandleLibrary(const std::string& library, const ClassDebugInfo& locp); - void HandleMissingValidators(void); + void HandleMissingValidators(); void CodeGenValidator(const std::string& name, const std::string& klass, const std::vector& rules, const std::string& field, const FieldType& fieldType, ValidatorType validatorType); void CodeGenValidatorSubrules(const std::string& name, const std::string& klass, const std::vector& rules); From 9ca682496c50c59e68e52477a1fc3c2c695b8a48 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 05:12:56 +0100 Subject: [PATCH 02/12] Apply clang-tidy fix 'modernize-use-override' --- icinga-studio/forms.h | 6 +- icinga-studio/icinga-studio.cpp | 2 +- icinga-studio/mainform.hpp | 8 +- lib/base/application.hpp | 8 +- lib/base/array.hpp | 10 +- lib/base/configobject.cpp | 2 +- lib/base/configobject.hpp | 6 +- lib/base/datetime.hpp | 4 +- lib/base/dictionary.hpp | 14 +-- lib/base/exception.cpp | 2 +- lib/base/exception.hpp | 12 +-- lib/base/fifo.hpp | 16 ++-- lib/base/filelogger.hpp | 2 +- lib/base/function.hpp | 2 +- lib/base/logger.hpp | 6 +- lib/base/networkstream.hpp | 8 +- lib/base/objecttype.hpp | 14 +-- lib/base/primitivetype.hpp | 14 +-- lib/base/process.hpp | 2 +- lib/base/socket.hpp | 2 +- lib/base/socketevents.hpp | 10 +- lib/base/stdiostream.hpp | 12 +-- lib/base/streamlogger.hpp | 6 +- lib/base/sysloglogger.hpp | 8 +- lib/base/timer.hpp | 2 +- lib/base/tlsstream.hpp | 20 ++-- lib/base/type.hpp | 22 ++--- lib/checker/checkercomponent.hpp | 6 +- lib/cli/apisetupcommand.hpp | 10 +- lib/cli/calistcommand.hpp | 8 +- lib/cli/casigncommand.hpp | 10 +- lib/cli/consolecommand.hpp | 10 +- lib/cli/daemoncommand.hpp | 10 +- lib/cli/featuredisablecommand.hpp | 14 +-- lib/cli/featureenablecommand.hpp | 14 +-- lib/cli/featurelistcommand.hpp | 6 +- lib/cli/nodesetupcommand.hpp | 12 +-- lib/cli/nodewizardcommand.hpp | 12 +-- lib/cli/objectlistcommand.hpp | 8 +- lib/cli/pkinewcacommand.hpp | 6 +- lib/cli/pkinewcertcommand.hpp | 10 +- lib/cli/pkirequestcommand.hpp | 10 +- lib/cli/pkisavecertcommand.hpp | 10 +- lib/cli/pkisigncsrcommand.hpp | 10 +- lib/cli/pkiticketcommand.hpp | 8 +- lib/cli/troubleshootcommand.hpp | 8 +- lib/cli/variablegetcommand.hpp | 8 +- lib/cli/variablelistcommand.hpp | 6 +- lib/compat/checkresultreader.hpp | 4 +- lib/compat/compatlogger.hpp | 6 +- lib/compat/externalcommandlistener.hpp | 4 +- lib/compat/statusdatawriter.hpp | 4 +- lib/config/configitem.cpp | 2 +- lib/config/expression.hpp | 104 ++++++++++----------- lib/db_ido/commanddbobject.hpp | 4 +- lib/db_ido/dbconnection.hpp | 14 +-- lib/db_ido/endpointdbobject.hpp | 4 +- lib/db_ido/hostdbobject.hpp | 10 +- lib/db_ido/hostgroupdbobject.hpp | 4 +- lib/db_ido/servicedbobject.hpp | 10 +- lib/db_ido/servicegroupdbobject.hpp | 4 +- lib/db_ido/timeperioddbobject.hpp | 6 +- lib/db_ido/userdbobject.hpp | 8 +- lib/db_ido/usergroupdbobject.hpp | 4 +- lib/db_ido/zonedbobject.hpp | 4 +- lib/db_ido_mysql/idomysqlconnection.hpp | 22 ++--- lib/db_ido_pgsql/idopgsqlconnection.hpp | 22 ++--- lib/demo/demo.hpp | 2 +- lib/hello/helloapplication.hpp | 2 +- lib/icinga/checkable.hpp | 14 +-- lib/icinga/command.hpp | 2 +- lib/icinga/comment.hpp | 6 +- lib/icinga/customvarobject.hpp | 2 +- lib/icinga/dependency.hpp | 8 +- lib/icinga/downtime.hpp | 10 +- lib/icinga/host.hpp | 20 ++-- lib/icinga/icingaapplication.hpp | 8 +- lib/icinga/notification.hpp | 14 +-- lib/icinga/scheduleddowntime.hpp | 6 +- lib/icinga/service.hpp | 14 +-- lib/icinga/timeperiod.hpp | 6 +- lib/icinga/user.hpp | 10 +- lib/livestatus/andfilter.hpp | 2 +- lib/livestatus/attributefilter.hpp | 2 +- lib/livestatus/avgaggregator.hpp | 4 +- lib/livestatus/commandstable.hpp | 6 +- lib/livestatus/commentstable.hpp | 6 +- lib/livestatus/contactgroupstable.hpp | 6 +- lib/livestatus/contactstable.hpp | 6 +- lib/livestatus/countaggregator.hpp | 4 +- lib/livestatus/downtimestable.hpp | 6 +- lib/livestatus/endpointstable.hpp | 6 +- lib/livestatus/hostgroupstable.hpp | 6 +- lib/livestatus/hoststable.hpp | 6 +- lib/livestatus/invavgaggregator.hpp | 4 +- lib/livestatus/invsumaggregator.hpp | 4 +- lib/livestatus/livestatuslistener.hpp | 6 +- lib/livestatus/logtable.hpp | 6 +- lib/livestatus/maxaggregator.hpp | 4 +- lib/livestatus/minaggregator.hpp | 4 +- lib/livestatus/negatefilter.hpp | 2 +- lib/livestatus/orfilter.hpp | 2 +- lib/livestatus/servicegroupstable.hpp | 6 +- lib/livestatus/servicestable.hpp | 6 +- lib/livestatus/statehisttable.hpp | 6 +- lib/livestatus/statustable.hpp | 6 +- lib/livestatus/stdaggregator.hpp | 4 +- lib/livestatus/sumaggregator.hpp | 4 +- lib/livestatus/timeperiodstable.hpp | 6 +- lib/livestatus/zonestable.hpp | 6 +- lib/notification/notificationcomponent.hpp | 4 +- lib/perfdata/elasticsearchwriter.hpp | 6 +- lib/perfdata/gelfwriter.hpp | 6 +- lib/perfdata/graphitewriter.hpp | 10 +- lib/perfdata/influxdbwriter.hpp | 10 +- lib/perfdata/opentsdbwriter.hpp | 4 +- lib/perfdata/perfdatawriter.hpp | 8 +- lib/remote/actionshandler.hpp | 2 +- lib/remote/apilistener.hpp | 10 +- lib/remote/configfileshandler.hpp | 2 +- lib/remote/configpackageshandler.hpp | 2 +- lib/remote/configstageshandler.hpp | 2 +- lib/remote/consolehandler.hpp | 2 +- lib/remote/createobjecthandler.hpp | 2 +- lib/remote/deleteobjecthandler.hpp | 2 +- lib/remote/endpoint.hpp | 4 +- lib/remote/eventshandler.hpp | 2 +- lib/remote/filterutility.hpp | 8 +- lib/remote/infohandler.hpp | 2 +- lib/remote/modifyobjecthandler.hpp | 2 +- lib/remote/objectqueryhandler.hpp | 2 +- lib/remote/statushandler.cpp | 8 +- lib/remote/statushandler.hpp | 2 +- lib/remote/templatequeryhandler.cpp | 8 +- lib/remote/templatequeryhandler.hpp | 2 +- lib/remote/typequeryhandler.cpp | 8 +- lib/remote/typequeryhandler.hpp | 2 +- lib/remote/variablequeryhandler.cpp | 8 +- lib/remote/variablequeryhandler.hpp | 2 +- lib/remote/zone.hpp | 4 +- tools/mkclass/classcompiler.cpp | 36 +++---- 141 files changed, 544 insertions(+), 544 deletions(-) diff --git a/icinga-studio/forms.h b/icinga-studio/forms.h index 77f6f3f3d..f01f5b904 100644 --- a/icinga-studio/forms.h +++ b/icinga-studio/forms.h @@ -61,7 +61,7 @@ class MainFormBase : public wxFrame MainFormBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Icinga Studio"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,569 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); - ~MainFormBase(); + ~MainFormBase() override; }; @@ -84,7 +84,7 @@ class ConnectFormBase : public wxDialog public: ConnectFormBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Icinga Studio - Connect"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); - ~ConnectFormBase(); + ~ConnectFormBase() override; }; @@ -101,7 +101,7 @@ class AboutFormBase : public wxDialog public: AboutFormBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Icinga Studio"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); - ~AboutFormBase(); + ~AboutFormBase() override; }; diff --git a/icinga-studio/icinga-studio.cpp b/icinga-studio/icinga-studio.cpp index e15ebbd26..1d3e657a3 100644 --- a/icinga-studio/icinga-studio.cpp +++ b/icinga-studio/icinga-studio.cpp @@ -29,7 +29,7 @@ using namespace icinga; class IcingaStudio final : public wxApp { public: - virtual bool OnInit() override + bool OnInit() override { Application::InitializeBase(); diff --git a/icinga-studio/mainform.hpp b/icinga-studio/mainform.hpp index 28c8bc99d..0e8363206 100644 --- a/icinga-studio/mainform.hpp +++ b/icinga-studio/mainform.hpp @@ -33,10 +33,10 @@ class MainForm final : public MainFormBase public: MainForm(wxWindow *parent, const Url::Ptr& url); - virtual void OnQuitClicked(wxCommandEvent& event) override; - virtual void OnAboutClicked(wxCommandEvent& event) override; - virtual void OnTypeSelected(wxTreeEvent& event) override; - virtual void OnObjectSelected(wxListEvent& event) override; + void OnQuitClicked(wxCommandEvent& event) override; + void OnAboutClicked(wxCommandEvent& event) override; + void OnTypeSelected(wxTreeEvent& event) override; + void OnObjectSelected(wxListEvent& event) override; private: ApiClient::Ptr m_ApiClient; diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 1f6874c46..6811c8936 100644 --- a/lib/base/application.hpp +++ b/lib/base/application.hpp @@ -41,7 +41,7 @@ public: static boost::signals2::signal OnReopenLogs; - ~Application(); + ~Application() override; static void InitializeBase(); static void UninitializeBase(); @@ -165,8 +165,8 @@ public: static void DisplayInfoMessage(std::ostream& os, bool skipVersion = false); protected: - virtual void OnConfigLoaded() override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Stop(bool runtimeRemoved) override; void RunEventLoop(); @@ -174,7 +174,7 @@ protected: virtual void OnShutdown(); - virtual void ValidateName(const String& value, const ValidationUtils& utils) override final; + void ValidateName(const String& value, const ValidationUtils& utils) final; private: static Application::Ptr m_Instance; /**< The application instance. */ diff --git a/lib/base/array.hpp b/lib/base/array.hpp index 3e19c7bfb..716d09683 100644 --- a/lib/base/array.hpp +++ b/lib/base/array.hpp @@ -50,7 +50,7 @@ public: Array(); Array(std::initializer_list init); - ~Array(); + ~Array() override; Value Get(SizeType index) const; void Set(SizeType index, const Value& value); @@ -103,16 +103,16 @@ public: return result; } - virtual Object::Ptr Clone() const override; + Object::Ptr Clone() const override; Array::Ptr Reverse() const; void Sort(); - virtual String ToString() const override; + String ToString() const override; - virtual Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; - virtual void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; + Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; + void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; private: std::vector m_Data; /**< The data for the array. */ diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index 4a6eb27bc..3f24c36ca 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -94,7 +94,7 @@ void ConfigObject::ClearExtension(const String& key) class ModAttrValidationUtils final : public ValidationUtils { public: - virtual bool ValidateName(const String& type, const String& name) const override + bool ValidateName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(type); ConfigType *dtype = dynamic_cast(ptype.get()); diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp index f3f7083dc..abb4e0120 100644 --- a/lib/base/configobject.hpp +++ b/lib/base/configobject.hpp @@ -65,8 +65,8 @@ public: void Deactivate(bool runtimeRemoved = false); void SetAuthority(bool authority); - virtual void Start(bool runtimeCreated = false) override; - virtual void Stop(bool runtimeRemoved = false) override; + void Start(bool runtimeCreated = false) override; + void Stop(bool runtimeRemoved = false) override; virtual void Pause(); virtual void Resume(); @@ -76,7 +76,7 @@ public: virtual void OnAllConfigLoaded(); virtual void OnStateLoaded(); - virtual Dictionary::Ptr GetSourceLocation() const override; + Dictionary::Ptr GetSourceLocation() const override; template static intrusive_ptr GetObject(const String& name) diff --git a/lib/base/datetime.hpp b/lib/base/datetime.hpp index 68d912414..7ac84dcfa 100644 --- a/lib/base/datetime.hpp +++ b/lib/base/datetime.hpp @@ -43,8 +43,8 @@ public: String Format(const String& format) const; - virtual double GetValue() const override; - virtual String ToString() const override; + double GetValue() const override; + String ToString() const override; static Object::Ptr GetPrototype(); diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp index 8dbdf9960..b2627b486 100644 --- a/lib/base/dictionary.hpp +++ b/lib/base/dictionary.hpp @@ -51,7 +51,7 @@ public: Dictionary(); - ~Dictionary(); + ~Dictionary() override; Value Get(const String& key) const; bool Get(const String& key, Value *result) const; @@ -77,14 +77,14 @@ public: static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone() const override; + Object::Ptr Clone() const override; - virtual String ToString() const override; + String ToString() const override; - virtual Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; - virtual void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; - virtual bool HasOwnField(const String& field) const override; - virtual bool GetOwnField(const String& field, Value *result) const override; + Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; + void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; + bool HasOwnField(const String& field) const override; + bool GetOwnField(const String& field, Value *result) const override; private: std::map m_Data; /**< The data for the dictionary. */ diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 4c34efea7..98bcd4241 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -34,7 +34,7 @@ static boost::thread_specific_ptr l_LastExceptionContext; class libcxx_type_info : public std::type_info { public: - virtual ~libcxx_type_info(); + ~libcxx_type_info() override; virtual void noop1() const; virtual void noop2() const; diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index 28aa9d4a7..9c26c7468 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -53,9 +53,9 @@ class ScriptError : virtual public user_error public: ScriptError(const String& message); ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false); - ~ScriptError() throw(); + ~ScriptError() throw() override; - virtual const char *what(void) const throw() override final; + const char *what(void) const throw() final; DebugInfo GetDebugInfo() const; bool IsIncompleteExpression() const; @@ -77,9 +77,9 @@ class ValidationError : virtual public user_error { public: ValidationError(const ConfigObject::Ptr& object, const std::vector& attributePath, const String& message); - ~ValidationError() throw(); + ~ValidationError() throw() override; - virtual const char *what(void) const throw() override final; + const char *what() const throw() override; ConfigObject::Ptr GetObject() const; std::vector GetAttributePath() const; @@ -126,9 +126,9 @@ String DiagnosticInformation(boost::exception_ptr eptr, bool verbose = true); class posix_error : virtual public std::exception, virtual public boost::exception { public: posix_error(); - virtual ~posix_error() throw(); + ~posix_error() throw() override; - virtual const char *what(void) const throw() override final; + const char *what(void) const throw() final; private: mutable char *m_Message; diff --git a/lib/base/fifo.hpp b/lib/base/fifo.hpp index ed707e432..6efc87060 100644 --- a/lib/base/fifo.hpp +++ b/lib/base/fifo.hpp @@ -39,15 +39,15 @@ public: static const size_t BlockSize = 512; FIFO(); - ~FIFO(); + ~FIFO() override; - virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; - virtual void Write(const void *buffer, size_t count) override; - virtual void Close() override; - virtual bool IsEof() const override; - virtual bool SupportsWaiting() const override; - virtual bool IsDataAvailable() const override; + size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; + size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + void Write(const void *buffer, size_t count) override; + void Close() override; + bool IsEof() const override; + bool SupportsWaiting() const override; + bool IsDataAvailable() const override; size_t GetAvailableBytes() const; diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp index e251b7b57..d4a5dc5ec 100644 --- a/lib/base/filelogger.hpp +++ b/lib/base/filelogger.hpp @@ -39,7 +39,7 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void Start(bool runtimeCreated) override; + void Start(bool runtimeCreated) override; private: void ReopenLogFile(); diff --git a/lib/base/function.hpp b/lib/base/function.hpp index 270f39b2d..c9fa4d5d2 100644 --- a/lib/base/function.hpp +++ b/lib/base/function.hpp @@ -63,7 +63,7 @@ public: static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone() const override; + Object::Ptr Clone() const override; private: Callback m_Callback; diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index a084f37c8..96dfd8efa 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -90,11 +90,11 @@ public: static void SetConsoleLogSeverity(LogSeverity logSeverity); static LogSeverity GetConsoleLogSeverity(); - virtual void ValidateSeverity(const String& value, const ValidationUtils& utils) override final; + void ValidateSeverity(const String& value, const ValidationUtils& utils) final; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: static boost::mutex m_Mutex; diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp index 86c4edb0e..6b4f25bd6 100644 --- a/lib/base/networkstream.hpp +++ b/lib/base/networkstream.hpp @@ -39,12 +39,12 @@ public: NetworkStream(const Socket::Ptr& socket); - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; - virtual void Write(const void *buffer, size_t count) override; + size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + void Write(const void *buffer, size_t count) override; - virtual void Close() override; + void Close() override; - virtual bool IsEof() const override; + bool IsEof() const override; private: Socket::Ptr m_Socket; diff --git a/lib/base/objecttype.hpp b/lib/base/objecttype.hpp index c750467be..c1508e0d0 100644 --- a/lib/base/objecttype.hpp +++ b/lib/base/objecttype.hpp @@ -32,15 +32,15 @@ class ObjectType final : public Type public: ObjectType(); - virtual String GetName() const override; - virtual Type::Ptr GetBaseType() const override; - virtual int GetAttributes() const override; - virtual int GetFieldId(const String& name) const override; - virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount() const override; + String GetName() const override; + Type::Ptr GetBaseType() const override; + int GetAttributes() const override; + int GetFieldId(const String& name) const override; + Field GetFieldInfo(int id) const override; + int GetFieldCount() const override; protected: - virtual ObjectFactory GetFactory() const override; + ObjectFactory GetFactory() const override; }; } diff --git a/lib/base/primitivetype.hpp b/lib/base/primitivetype.hpp index a559e603d..562399dc7 100644 --- a/lib/base/primitivetype.hpp +++ b/lib/base/primitivetype.hpp @@ -32,15 +32,15 @@ class PrimitiveType final : public Type public: PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory()); - virtual String GetName() const override; - virtual Type::Ptr GetBaseType() const override; - virtual int GetAttributes() const override; - virtual int GetFieldId(const String& name) const override; - virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount() const override; + String GetName() const override; + Type::Ptr GetBaseType() const override; + int GetAttributes() const override; + int GetFieldId(const String& name) const override; + Field GetFieldInfo(int id) const override; + int GetFieldCount() const override; protected: - virtual ObjectFactory GetFactory() const override; + ObjectFactory GetFactory() const override; private: String m_Name; diff --git a/lib/base/process.hpp b/lib/base/process.hpp index e0d7b7201..6e62f1df7 100644 --- a/lib/base/process.hpp +++ b/lib/base/process.hpp @@ -67,7 +67,7 @@ public: static const std::deque::size_type MaxTasksPerThread = 512; Process(const Arguments& arguments, const Dictionary::Ptr& extraEnvironment = nullptr); - ~Process(); + ~Process() override; void SetTimeout(double timeout); double GetTimeout() const; diff --git a/lib/base/socket.hpp b/lib/base/socket.hpp index 3cea5e1f5..e606f46e5 100644 --- a/lib/base/socket.hpp +++ b/lib/base/socket.hpp @@ -38,7 +38,7 @@ public: Socket(); Socket(SOCKET fd); - ~Socket(); + ~Socket() override; SOCKET GetFD() const; diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp index 0e797f54f..1617e6114 100644 --- a/lib/base/socketevents.hpp +++ b/lib/base/socketevents.hpp @@ -122,13 +122,13 @@ protected: class SocketEventEnginePoll final : public SocketEventEngine { public: - virtual void Register(SocketEvents *se, Object *lifesupportObject); - virtual void Unregister(SocketEvents *se); - virtual void ChangeEvents(SocketEvents *se, int events); + void Register(SocketEvents *se, Object *lifesupportObject) override; + void Unregister(SocketEvents *se) override; + void ChangeEvents(SocketEvents *se, int events) override; protected: - virtual void InitializeThread(int tid); - virtual void ThreadProc(int tid); + void InitializeThread(int tid) override; + void ThreadProc(int tid) override; }; #ifdef __linux__ diff --git a/lib/base/stdiostream.hpp b/lib/base/stdiostream.hpp index 6058f14bf..027e39f97 100644 --- a/lib/base/stdiostream.hpp +++ b/lib/base/stdiostream.hpp @@ -32,15 +32,15 @@ public: DECLARE_PTR_TYPEDEFS(StdioStream); StdioStream(std::iostream *innerStream, bool ownsStream); - ~StdioStream(); + ~StdioStream() override; - virtual size_t Read(void *buffer, size_t size, bool allow_partial = false) override; - virtual void Write(const void *buffer, size_t size) override; + size_t Read(void *buffer, size_t size, bool allow_partial = false) override; + void Write(const void *buffer, size_t size) override; - virtual void Close() override; + void Close() override; - virtual bool IsDataAvailable() const override; - virtual bool IsEof() const override; + bool IsDataAvailable() const override; + bool IsEof() const override; private: std::iostream *m_InnerStream; diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp index fe590bcce..cf45e1461 100644 --- a/lib/base/streamlogger.hpp +++ b/lib/base/streamlogger.hpp @@ -40,8 +40,8 @@ public: StreamLogger(); - virtual void Stop(bool runtimeRemoved) override; - ~StreamLogger(); + void Stop(bool runtimeRemoved) override; + ~StreamLogger() override; void BindStream(std::ostream *stream, bool ownsStream); @@ -49,7 +49,7 @@ public: protected: void ProcessLogEntry(const LogEntry& entry) final; - void Flush(void) final; + void Flush() final; private: static boost::mutex m_Mutex; diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp index 4101dadfd..f61848b41 100644 --- a/lib/base/sysloglogger.hpp +++ b/lib/base/sysloglogger.hpp @@ -41,15 +41,15 @@ public: static void StaticInitialize(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void OnConfigLoaded() override; - virtual void ValidateFacility(const String& value, const ValidationUtils& utils) override; + void OnConfigLoaded() override; + void ValidateFacility(const String& value, const ValidationUtils& utils) override; protected: static std::map m_FacilityMap; int m_Facility; - virtual void ProcessLogEntry(const LogEntry& entry) override; - virtual void Flush() override; + void ProcessLogEntry(const LogEntry& entry) override; + void Flush() override; }; } diff --git a/lib/base/timer.hpp b/lib/base/timer.hpp index 5e7555e19..639b5f5a1 100644 --- a/lib/base/timer.hpp +++ b/lib/base/timer.hpp @@ -39,7 +39,7 @@ public: DECLARE_PTR_TYPEDEFS(Timer); Timer(); - ~Timer(); + ~Timer() override; static void Uninitialize(); diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp index ce661979a..3528d430b 100644 --- a/lib/base/tlsstream.hpp +++ b/lib/base/tlsstream.hpp @@ -49,7 +49,7 @@ public: DECLARE_PTR_TYPEDEFS(TlsStream); TlsStream(const Socket::Ptr& socket, const String& hostname, ConnectionRole role, const std::shared_ptr& sslContext = MakeSSLContext()); - ~TlsStream(); + ~TlsStream() override; Socket::Ptr GetSocket() const; @@ -58,17 +58,17 @@ public: void Handshake(); - virtual void Close() override; - virtual void Shutdown() override; + void Close() override; + void Shutdown() override; - virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; - virtual void Write(const void *buffer, size_t count) override; + size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; + size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + void Write(const void *buffer, size_t count) override; - virtual bool IsEof() const override; + bool IsEof() const override; - virtual bool SupportsWaiting() const override; - virtual bool IsDataAvailable() const override; + bool SupportsWaiting() const override; + bool IsDataAvailable() const override; bool IsVerifyOK() const; String GetVerifyError() const; @@ -97,7 +97,7 @@ private: static int m_SSLIndex; static bool m_SSLIndexInitialized; - virtual void OnEvent(int revents) override; + void OnEvent(int revents) override; void HandleError() const; diff --git a/lib/base/type.hpp b/lib/base/type.hpp index 54eeb802b..56563adc6 100644 --- a/lib/base/type.hpp +++ b/lib/base/type.hpp @@ -76,9 +76,9 @@ public: DECLARE_OBJECT(Type); Type(); - ~Type(); + ~Type() override; - virtual String ToString() const override; + String ToString() const override; virtual String GetName() const = 0; virtual Type::Ptr GetBaseType() const = 0; @@ -102,8 +102,8 @@ public: static Type::Ptr GetByName(const String& name); static std::vector GetAllTypes(); - virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override; - virtual Value GetField(int id) const override; + void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override; + Value GetField(int id) const override; virtual std::vector GetLoadDependencies() const; @@ -122,17 +122,17 @@ class TypeType final : public Type public: DECLARE_PTR_TYPEDEFS(Type); - virtual String GetName() const override; - virtual Type::Ptr GetBaseType() const override; - virtual int GetAttributes() const override; - virtual int GetFieldId(const String& name) const override; - virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount() const override; + String GetName() const override; + Type::Ptr GetBaseType() const override; + int GetAttributes() const override; + int GetFieldId(const String& name) const override; + Field GetFieldInfo(int id) const override; + int GetFieldCount() const override; static Object::Ptr GetPrototype(); protected: - virtual ObjectFactory GetFactory() const override; + ObjectFactory GetFactory() const override; }; template diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp index 02cfef1cc..f89e53452 100644 --- a/lib/checker/checkercomponent.hpp +++ b/lib/checker/checkercomponent.hpp @@ -79,9 +79,9 @@ public: CheckerComponent(); - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); unsigned long GetIdleCheckables(); diff --git a/lib/cli/apisetupcommand.hpp b/lib/cli/apisetupcommand.hpp index 63787a5d1..f54da0685 100644 --- a/lib/cli/apisetupcommand.hpp +++ b/lib/cli/apisetupcommand.hpp @@ -35,11 +35,11 @@ class ApiSetupCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ApiSetupCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMaxArguments() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMaxArguments() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + ImpersonationLevel GetImpersonationLevel() const override; }; } diff --git a/lib/cli/calistcommand.hpp b/lib/cli/calistcommand.hpp index 517133819..e71ffd872 100644 --- a/lib/cli/calistcommand.hpp +++ b/lib/cli/calistcommand.hpp @@ -35,11 +35,11 @@ class CAListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(CAListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static void PrintRequest(const String& requestFile); diff --git a/lib/cli/casigncommand.hpp b/lib/cli/casigncommand.hpp index a45fc0b9d..28ae8b82a 100644 --- a/lib/cli/casigncommand.hpp +++ b/lib/cli/casigncommand.hpp @@ -35,11 +35,11 @@ class CASignCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(CASignCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; + ImpersonationLevel GetImpersonationLevel() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/consolecommand.hpp b/lib/cli/consolecommand.hpp index 8a49e5b8b..6180c58a9 100644 --- a/lib/cli/consolecommand.hpp +++ b/lib/cli/consolecommand.hpp @@ -39,12 +39,12 @@ public: static void StaticInitialize(); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + ImpersonationLevel GetImpersonationLevel() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; static int RunScriptConsole(ScriptFrame& scriptFrame, const String& addr = String(), const String& session = String(), const String& commandOnce = String(), const String& commandOnceFileName = String(), diff --git a/lib/cli/daemoncommand.hpp b/lib/cli/daemoncommand.hpp index ab257f68f..7fafe6d10 100644 --- a/lib/cli/daemoncommand.hpp +++ b/lib/cli/daemoncommand.hpp @@ -35,12 +35,12 @@ class DaemonCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(DaemonCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp index 8bcf49929..7dc5465d2 100644 --- a/lib/cli/featuredisablecommand.hpp +++ b/lib/cli/featuredisablecommand.hpp @@ -35,13 +35,13 @@ class FeatureDisableCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureDisableCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; - virtual int GetMaxArguments() const override; - virtual std::vector GetPositionalSuggestions(const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; + int GetMaxArguments() const override; + std::vector GetPositionalSuggestions(const String& word) const override; + ImpersonationLevel GetImpersonationLevel() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/featureenablecommand.hpp b/lib/cli/featureenablecommand.hpp index 24417ac47..a81ecc2c9 100644 --- a/lib/cli/featureenablecommand.hpp +++ b/lib/cli/featureenablecommand.hpp @@ -35,13 +35,13 @@ class FeatureEnableCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureEnableCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; - virtual int GetMaxArguments() const override; - virtual std::vector GetPositionalSuggestions(const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; + int GetMaxArguments() const override; + std::vector GetPositionalSuggestions(const String& word) const override; + ImpersonationLevel GetImpersonationLevel() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/featurelistcommand.hpp b/lib/cli/featurelistcommand.hpp index 75882fcf1..46f357c75 100644 --- a/lib/cli/featurelistcommand.hpp +++ b/lib/cli/featurelistcommand.hpp @@ -35,9 +35,9 @@ class FeatureListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/nodesetupcommand.hpp b/lib/cli/nodesetupcommand.hpp index 4f0e6c890..1e3560a3b 100644 --- a/lib/cli/nodesetupcommand.hpp +++ b/lib/cli/nodesetupcommand.hpp @@ -35,13 +35,13 @@ class NodeSetupCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeSetupCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + ImpersonationLevel GetImpersonationLevel() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector& ap); diff --git a/lib/cli/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp index 7377fe32d..5cc6033c0 100644 --- a/lib/cli/nodewizardcommand.hpp +++ b/lib/cli/nodewizardcommand.hpp @@ -35,12 +35,12 @@ class NodeWizardCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeWizardCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMaxArguments() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + int GetMaxArguments() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + ImpersonationLevel GetImpersonationLevel() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; private: diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp index 36a41f2f3..2220e40c8 100644 --- a/lib/cli/objectlistcommand.hpp +++ b/lib/cli/objectlistcommand.hpp @@ -38,11 +38,11 @@ class ObjectListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ObjectListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static void PrintTypeCounts(std::ostream& fp, const std::map& type_count); diff --git a/lib/cli/pkinewcacommand.hpp b/lib/cli/pkinewcacommand.hpp index 515ac98e2..b9d362a9a 100644 --- a/lib/cli/pkinewcacommand.hpp +++ b/lib/cli/pkinewcacommand.hpp @@ -35,9 +35,9 @@ class PKINewCACommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCACommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkinewcertcommand.hpp b/lib/cli/pkinewcertcommand.hpp index eb64a0ebd..c3b639c23 100644 --- a/lib/cli/pkinewcertcommand.hpp +++ b/lib/cli/pkinewcertcommand.hpp @@ -35,12 +35,12 @@ class PKINewCertCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCertCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkirequestcommand.hpp b/lib/cli/pkirequestcommand.hpp index 2788cb1b7..71b9ca3a9 100644 --- a/lib/cli/pkirequestcommand.hpp +++ b/lib/cli/pkirequestcommand.hpp @@ -35,12 +35,12 @@ class PKIRequestCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKIRequestCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkisavecertcommand.hpp b/lib/cli/pkisavecertcommand.hpp index ceed29201..0fb0c4847 100644 --- a/lib/cli/pkisavecertcommand.hpp +++ b/lib/cli/pkisavecertcommand.hpp @@ -35,12 +35,12 @@ class PKISaveCertCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISaveCertCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkisigncsrcommand.hpp b/lib/cli/pkisigncsrcommand.hpp index 535e16ca7..da9e1c8e7 100644 --- a/lib/cli/pkisigncsrcommand.hpp +++ b/lib/cli/pkisigncsrcommand.hpp @@ -35,12 +35,12 @@ class PKISignCSRCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISignCSRCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkiticketcommand.hpp b/lib/cli/pkiticketcommand.hpp index f94230ce5..0ada10ea5 100644 --- a/lib/cli/pkiticketcommand.hpp +++ b/lib/cli/pkiticketcommand.hpp @@ -35,11 +35,11 @@ class PKITicketCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKITicketCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/troubleshootcommand.hpp b/lib/cli/troubleshootcommand.hpp index 85ce0c243..dbe5fba5e 100644 --- a/lib/cli/troubleshootcommand.hpp +++ b/lib/cli/troubleshootcommand.hpp @@ -37,10 +37,10 @@ class TroubleshootCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(TroubleshootCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; private: diff --git a/lib/cli/variablegetcommand.hpp b/lib/cli/variablegetcommand.hpp index 8f01dc89a..84f63df5b 100644 --- a/lib/cli/variablegetcommand.hpp +++ b/lib/cli/variablegetcommand.hpp @@ -38,12 +38,12 @@ class VariableGetCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableGetCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/variablelistcommand.hpp b/lib/cli/variablelistcommand.hpp index 1e964ff2c..d5502dca1 100644 --- a/lib/cli/variablelistcommand.hpp +++ b/lib/cli/variablelistcommand.hpp @@ -38,9 +38,9 @@ class VariableListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static void PrintVariable(std::ostream& fp, const String& message); diff --git a/lib/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp index 691efd235..2885e3fc4 100644 --- a/lib/compat/checkresultreader.hpp +++ b/lib/compat/checkresultreader.hpp @@ -41,8 +41,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Timer::Ptr m_ReadTimer; diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp index 14052f810..1cfb2a28e 100644 --- a/lib/compat/compatlogger.hpp +++ b/lib/compat/compatlogger.hpp @@ -41,11 +41,11 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateRotationMethod(const String& value, const ValidationUtils& utils) override; + void ValidateRotationMethod(const String& value, const ValidationUtils& utils) override; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: void WriteLine(const String& line); diff --git a/lib/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp index 93c47ae33..3510cd995 100644 --- a/lib/compat/externalcommandlistener.hpp +++ b/lib/compat/externalcommandlistener.hpp @@ -42,8 +42,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: #ifndef _WIN32 diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp index 0b04bcefd..c19377408 100644 --- a/lib/compat/statusdatawriter.hpp +++ b/lib/compat/statusdatawriter.hpp @@ -45,8 +45,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Timer::Ptr m_StatusTimer; diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 8e10ef12c..20508c94c 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -155,7 +155,7 @@ std::shared_ptr ConfigItem::GetFilter() const class DefaultValidationUtils final : public ValidationUtils { public: - virtual bool ValidateName(const String& type, const String& name) const override + bool ValidateName(const String& type, const String& name) const override { ConfigItem::Ptr item = ConfigItem::GetByTypeAndName(Type::GetByName(type), name); diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index 3faa8f1b4..7dc0876a3 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -225,12 +225,12 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override { return m_Expression->DoEvaluate(frame, dhint); } - virtual const DebugInfo& GetDebugInfo() const override + const DebugInfo& GetDebugInfo() const override { return m_Expression->GetDebugInfo(); } @@ -250,7 +250,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: Value m_Value; @@ -274,7 +274,7 @@ public: { } protected: - const DebugInfo& GetDebugInfo(void) const final; + const DebugInfo& GetDebugInfo() const final; DebugInfo m_DebugInfo; }; @@ -315,8 +315,8 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; - virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; private: String m_Variable; @@ -332,7 +332,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LogicalNegateExpression final : public UnaryExpression @@ -343,7 +343,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class AddExpression final : public BinaryExpression @@ -354,7 +354,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class SubtractExpression final : public BinaryExpression @@ -365,7 +365,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class MultiplyExpression final : public BinaryExpression @@ -376,7 +376,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class DivideExpression final : public BinaryExpression @@ -387,7 +387,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ModuloExpression final : public BinaryExpression @@ -398,7 +398,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class XorExpression final : public BinaryExpression @@ -409,7 +409,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class BinaryAndExpression final : public BinaryExpression @@ -420,7 +420,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class BinaryOrExpression final : public BinaryExpression @@ -431,7 +431,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ShiftLeftExpression final : public BinaryExpression @@ -442,7 +442,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ShiftRightExpression final : public BinaryExpression @@ -453,7 +453,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class EqualExpression final : public BinaryExpression @@ -464,7 +464,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class NotEqualExpression final : public BinaryExpression @@ -475,7 +475,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LessThanExpression final : public BinaryExpression @@ -486,7 +486,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class GreaterThanExpression final : public BinaryExpression @@ -497,7 +497,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LessThanOrEqualExpression final : public BinaryExpression @@ -508,7 +508,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class GreaterThanOrEqualExpression final : public BinaryExpression @@ -519,7 +519,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class InExpression final : public BinaryExpression @@ -530,7 +530,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class NotInExpression final : public BinaryExpression @@ -541,7 +541,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LogicalAndExpression final : public BinaryExpression @@ -552,7 +552,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LogicalOrExpression final : public BinaryExpression @@ -563,7 +563,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class FunctionCallExpression final : public DebuggableExpression @@ -574,7 +574,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; public: std::unique_ptr m_FName; @@ -589,7 +589,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector > m_Expressions; @@ -605,7 +605,7 @@ public: void MakeInline(); protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector > m_Expressions; @@ -622,7 +622,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: CombinedSetOp m_Op; @@ -638,7 +638,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Condition; @@ -654,7 +654,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Condition; @@ -670,7 +670,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class BreakExpression final : public DebuggableExpression @@ -681,7 +681,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ContinueExpression final : public DebuggableExpression @@ -692,7 +692,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class GetScopeExpression final : public Expression @@ -703,7 +703,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: ScopeSpecifier m_ScopeSpec; @@ -717,8 +717,8 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; - virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; friend void BindToScope(std::unique_ptr& expr, ScopeSpecifier scopeSpec); }; @@ -733,7 +733,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Message; @@ -748,7 +748,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Name; @@ -762,7 +762,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class FunctionExpression final : public DebuggableExpression @@ -774,7 +774,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_Name; @@ -797,7 +797,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_Type; @@ -825,7 +825,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: bool m_Abstract; @@ -848,7 +848,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_FKVar; @@ -865,7 +865,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; enum IncludeType @@ -885,7 +885,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_RelativeBase; @@ -906,7 +906,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class UsingExpression final : public DebuggableExpression @@ -917,7 +917,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Name; @@ -931,7 +931,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_TryBody; diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp index 58d742688..18534e423 100644 --- a/lib/db_ido/commanddbobject.hpp +++ b/lib/db_ido/commanddbobject.hpp @@ -38,8 +38,8 @@ public: CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp index 0175f29e8..ea8cd7ac8 100644 --- a/lib/db_ido/dbconnection.hpp +++ b/lib/db_ido/dbconnection.hpp @@ -76,15 +76,15 @@ public: int GetQueryCount(RingBuffer::SizeType span); virtual int GetPendingQueryCount() const = 0; - virtual void ValidateFailoverTimeout(double value, const ValidationUtils& utils) override final; - virtual void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) override final; + void ValidateFailoverTimeout(double value, const ValidationUtils& utils) final; + void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) final; protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; - virtual void Resume() override; - virtual void Pause() override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; + void Resume() override; + void Pause() override; virtual void ExecuteQuery(const DbQuery& query) = 0; virtual void ExecuteMultipleQueries(const std::vector&) = 0; diff --git a/lib/db_ido/endpointdbobject.hpp b/lib/db_ido/endpointdbobject.hpp index a10de9ccd..e2edb4b6f 100644 --- a/lib/db_ido/endpointdbobject.hpp +++ b/lib/db_ido/endpointdbobject.hpp @@ -41,8 +41,8 @@ public: static void StaticInitialize(); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; private: static void UpdateConnectedStatus(const Endpoint::Ptr& endpoint); diff --git a/lib/db_ido/hostdbobject.hpp b/lib/db_ido/hostdbobject.hpp index 31e799d47..6d5afc7ac 100644 --- a/lib/db_ido/hostdbobject.hpp +++ b/lib/db_ido/hostdbobject.hpp @@ -38,13 +38,13 @@ public: HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; - virtual void OnConfigUpdateLight() override; + void OnConfigUpdateHeavy() override; + void OnConfigUpdateLight() override; - virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; + String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; private: void DoCommonConfigUpdate(); diff --git a/lib/db_ido/hostgroupdbobject.hpp b/lib/db_ido/hostgroupdbobject.hpp index 7b948b62e..dc7016959 100644 --- a/lib/db_ido/hostgroupdbobject.hpp +++ b/lib/db_ido/hostgroupdbobject.hpp @@ -39,8 +39,8 @@ public: HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; private: static void MembersChangedHandler(const HostGroup::Ptr& hgfilter); diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp index 98990fd24..b88bbbd86 100644 --- a/lib/db_ido/servicedbobject.hpp +++ b/lib/db_ido/servicedbobject.hpp @@ -41,13 +41,13 @@ public: static void StaticInitialize(); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; - virtual void OnConfigUpdateLight() override; + void OnConfigUpdateHeavy() override; + void OnConfigUpdateLight() override; - virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; + String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; private: void DoCommonConfigUpdate(); diff --git a/lib/db_ido/servicegroupdbobject.hpp b/lib/db_ido/servicegroupdbobject.hpp index da08968c3..c62516352 100644 --- a/lib/db_ido/servicegroupdbobject.hpp +++ b/lib/db_ido/servicegroupdbobject.hpp @@ -39,8 +39,8 @@ public: ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/timeperioddbobject.hpp b/lib/db_ido/timeperioddbobject.hpp index 171c2d70b..f40a024f3 100644 --- a/lib/db_ido/timeperioddbobject.hpp +++ b/lib/db_ido/timeperioddbobject.hpp @@ -39,10 +39,10 @@ public: TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2); protected: - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; + void OnConfigUpdateHeavy() override; }; } diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp index 0ce3480a2..fa2be5198 100644 --- a/lib/db_ido/userdbobject.hpp +++ b/lib/db_ido/userdbobject.hpp @@ -39,12 +39,12 @@ public: UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2); protected: - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; + void OnConfigUpdateHeavy() override; - virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; + String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; }; } diff --git a/lib/db_ido/usergroupdbobject.hpp b/lib/db_ido/usergroupdbobject.hpp index 7a04cb41a..ec2330627 100644 --- a/lib/db_ido/usergroupdbobject.hpp +++ b/lib/db_ido/usergroupdbobject.hpp @@ -39,8 +39,8 @@ public: UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/zonedbobject.hpp b/lib/db_ido/zonedbobject.hpp index 815d00542..ac051ab6c 100644 --- a/lib/db_ido/zonedbobject.hpp +++ b/lib/db_ido/zonedbobject.hpp @@ -39,8 +39,8 @@ public: ZoneDbObject(const intrusive_ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp index 85d89a10d..67fba0101 100644 --- a/lib/db_ido_mysql/idomysqlconnection.hpp +++ b/lib/db_ido_mysql/idomysqlconnection.hpp @@ -55,20 +55,20 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual int GetPendingQueryCount() const override; + int GetPendingQueryCount() const override; protected: - virtual void OnConfigLoaded() override; - virtual void Resume() override; - virtual void Pause() override; + void OnConfigLoaded() override; + void Resume() override; + void Pause() override; - virtual void ActivateObject(const DbObject::Ptr& dbobj) override; - virtual void DeactivateObject(const DbObject::Ptr& dbobj) override; - virtual void ExecuteQuery(const DbQuery& query) override; - virtual void ExecuteMultipleQueries(const std::vector& queries) override; - virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; - virtual void FillIDCache(const DbType::Ptr& type) override; - virtual void NewTransaction() override; + void ActivateObject(const DbObject::Ptr& dbobj) override; + void DeactivateObject(const DbObject::Ptr& dbobj) override; + void ExecuteQuery(const DbQuery& query) override; + void ExecuteMultipleQueries(const std::vector& queries) override; + void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; + void FillIDCache(const DbType::Ptr& type) override; + void NewTransaction() override; private: DbReference m_InstanceID; diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp index 9a3d20907..1d0e2f710 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.hpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp @@ -47,20 +47,20 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual int GetPendingQueryCount() const override; + int GetPendingQueryCount() const override; protected: - virtual void OnConfigLoaded() override; - virtual void Resume() override; - virtual void Pause() override; + void OnConfigLoaded() override; + void Resume() override; + void Pause() override; - virtual void ActivateObject(const DbObject::Ptr& dbobj) override; - virtual void DeactivateObject(const DbObject::Ptr& dbobj) override; - virtual void ExecuteQuery(const DbQuery& query) override; - virtual void ExecuteMultipleQueries(const std::vector& queries) override; - virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; - virtual void FillIDCache(const DbType::Ptr& type) override; - virtual void NewTransaction() override; + void ActivateObject(const DbObject::Ptr& dbobj) override; + void DeactivateObject(const DbObject::Ptr& dbobj) override; + void ExecuteQuery(const DbQuery& query) override; + void ExecuteMultipleQueries(const std::vector& queries) override; + void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; + void FillIDCache(const DbType::Ptr& type) override; + void NewTransaction() override; private: DbReference m_InstanceID; diff --git a/lib/demo/demo.hpp b/lib/demo/demo.hpp index adba73026..a51c35959 100644 --- a/lib/demo/demo.hpp +++ b/lib/demo/demo.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(Demo); DECLARE_OBJECTNAME(Demo); - virtual void Start(bool runtimeCreated) override; + void Start(bool runtimeCreated) override; static Value DemoMessageHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); diff --git a/lib/hello/helloapplication.hpp b/lib/hello/helloapplication.hpp index a4f6bd111..9d9bfa806 100644 --- a/lib/hello/helloapplication.hpp +++ b/lib/hello/helloapplication.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(HelloApplication); DECLARE_OBJECTNAME(HelloApplication); - virtual int Main() override; + int Main() override; }; } diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index 76dfa8f85..202a7eca6 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -101,7 +101,7 @@ public: void AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify = true, bool persistent = false, double expiry = 0, const MessageOrigin::Ptr& origin = nullptr); void ClearAcknowledgement(const MessageOrigin::Ptr& origin = nullptr); - virtual int GetSeverity() const override; + int GetSeverity() const override; /* Checks */ intrusive_ptr GetCheckCommand() const; @@ -115,7 +115,7 @@ public: bool HasBeenChecked() const; virtual bool IsStateOK(ServiceState state) = 0; - double GetLastCheck(void) const final; + double GetLastCheck() const final; virtual void SaveLastState(ServiceState state, double timestamp) = 0; @@ -145,7 +145,7 @@ public: static boost::signals2::signal OnEventCommandExecuted; /* Downtimes */ - int GetDowntimeDepth(void) const final; + int GetDowntimeDepth() const final; void RemoveAllDowntimes(); void TriggerDowntimes(); @@ -191,8 +191,8 @@ public: void RemoveReverseDependency(const intrusive_ptr& dep); std::vector > GetReverseDependencies() const; - virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override final; - virtual void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) override final; + void ValidateCheckInterval(double value, const ValidationUtils& utils) final; + void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) final; static void IncreasePendingChecks(); static void DecreasePendingChecks(); @@ -201,8 +201,8 @@ public: static Object::Ptr GetPrototype(); protected: - virtual void Start(bool runtimeCreated) override; - virtual void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void OnAllConfigLoaded() override; private: mutable boost::mutex m_CheckableMutex; diff --git a/lib/icinga/command.hpp b/lib/icinga/command.hpp index a64606d26..82d6aceaf 100644 --- a/lib/icinga/command.hpp +++ b/lib/icinga/command.hpp @@ -39,7 +39,7 @@ public: //virtual Dictionary::Ptr Execute(const Object::Ptr& context) = 0; - virtual void Validate(int types, const ValidationUtils& utils) override; + void Validate(int types, const ValidationUtils& utils) override; }; } diff --git a/lib/icinga/comment.hpp b/lib/icinga/comment.hpp index 9a1bc97e7..d8cb2a91e 100644 --- a/lib/icinga/comment.hpp +++ b/lib/icinga/comment.hpp @@ -57,9 +57,9 @@ public: static String GetCommentIDFromLegacyID(int id); protected: - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: ObjectImpl::Ptr m_Checkable; diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp index aa88c64e5..4cf16f66a 100644 --- a/lib/icinga/customvarobject.hpp +++ b/lib/icinga/customvarobject.hpp @@ -38,7 +38,7 @@ class CustomVarObject : public ObjectImpl public: DECLARE_OBJECT(CustomVarObject); - virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override final; + void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) final; }; int FilterArrayToInt(const Array::Ptr& typeFilters, const std::map& filterMap, int defaultValue); diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp index 8f9c364a2..3f5775f34 100644 --- a/lib/icinga/dependency.hpp +++ b/lib/icinga/dependency.hpp @@ -49,15 +49,15 @@ public: bool IsAvailable(DependencyType dt) const; - virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); protected: - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; + void Stop(bool runtimeRemoved) override; private: Checkable::Ptr m_Parent; diff --git a/lib/icinga/downtime.hpp b/lib/icinga/downtime.hpp index a07496f78..1c120c019 100644 --- a/lib/icinga/downtime.hpp +++ b/lib/icinga/downtime.hpp @@ -66,12 +66,12 @@ public: static String GetDowntimeIDFromLegacyID(int id); protected: - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; - virtual void ValidateStartTime(const Timestamp& value, const ValidationUtils& utils) override; - virtual void ValidateEndTime(const Timestamp& value, const ValidationUtils& utils) override; + void ValidateStartTime(const Timestamp& value, const ValidationUtils& utils) override; + void ValidateEndTime(const Timestamp& value, const ValidationUtils& utils) override; private: ObjectImpl::Ptr m_Checkable; diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp index e3a5ac7af..a4969e866 100644 --- a/lib/icinga/host.hpp +++ b/lib/icinga/host.hpp @@ -51,13 +51,13 @@ public: static HostState CalculateState(ServiceState state); - virtual HostState GetState() const override; - virtual HostState GetLastState() const override; - virtual HostState GetLastHardState() const override; - virtual int GetSeverity() const override; + HostState GetState() const override; + HostState GetLastState() const override; + HostState GetLastHardState() const override; + int GetSeverity() const override; - virtual bool IsStateOK(ServiceState state) override; - virtual void SaveLastState(ServiceState state, double timestamp) override; + bool IsStateOK(ServiceState state) override; + void SaveLastState(ServiceState state, double timestamp) override; static HostState StateFromString(const String& state); static String StateToString(HostState state); @@ -65,13 +65,13 @@ public: static StateType StateTypeFromString(const String& state); static String StateTypeToString(StateType state); - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; + bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; protected: - virtual void Stop(bool runtimeRemoved) override; + void Stop(bool runtimeRemoved) override; - virtual void OnAllConfigLoaded() override; - virtual void CreateChildObjects(const Type::Ptr& childType) override; + void OnAllConfigLoaded() override; + void CreateChildObjects(const Type::Ptr& childType) override; private: mutable boost::mutex m_ServicesMutex; diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp index fc8e0c624..9329a202a 100644 --- a/lib/icinga/icingaapplication.hpp +++ b/lib/icinga/icingaapplication.hpp @@ -40,7 +40,7 @@ public: static void StaticInitialize(); - virtual int Main() override; + int Main() override; static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); @@ -48,17 +48,17 @@ public: String GetPidPath() const; - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; + bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; String GetNodeName() const; - virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override; private: void DumpProgramState(); void DumpModifiedAttributes(); - virtual void OnShutdown() override; + void OnShutdown() override; }; } diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp index 3e4668f26..b87bb702c 100644 --- a/lib/icinga/notification.hpp +++ b/lib/icinga/notification.hpp @@ -104,10 +104,10 @@ public: static boost::signals2::signal OnNextNotificationChanged; - virtual void Validate(int types, const ValidationUtils& utils) override; + void Validate(int types, const ValidationUtils& utils) override; - virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; - virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); @@ -116,10 +116,10 @@ public: static const std::map& GetTypeFilterMap(); protected: - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: ObjectImpl::Ptr m_Checkable; diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp index 125c8da9f..5b8b322f5 100644 --- a/lib/icinga/scheduleddowntime.hpp +++ b/lib/icinga/scheduleddowntime.hpp @@ -49,11 +49,11 @@ public: static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); - virtual void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; private: static void TimerProc(); diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp index 0044e48cf..dd7c54e1f 100644 --- a/lib/icinga/service.hpp +++ b/lib/icinga/service.hpp @@ -45,13 +45,13 @@ public: static Service::Ptr GetByNamePair(const String& hostName, const String& serviceName); - virtual Host::Ptr GetHost() const override; - virtual int GetSeverity() const override; + Host::Ptr GetHost() const override; + int GetSeverity() const override; - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; + bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; - virtual bool IsStateOK(ServiceState state) override; - virtual void SaveLastState(ServiceState state, double timestamp) override; + bool IsStateOK(ServiceState state) override; + void SaveLastState(ServiceState state, double timestamp) override; static ServiceState StateFromString(const String& state); static String StateToString(ServiceState state); @@ -62,8 +62,8 @@ public: static void EvaluateApplyRules(const Host::Ptr& host); protected: - virtual void OnAllConfigLoaded() override; - virtual void CreateChildObjects(const Type::Ptr& childType) override; + void OnAllConfigLoaded() override; + void CreateChildObjects(const Type::Ptr& childType) override; private: Host::Ptr m_Host; diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp index c8a7bbe42..9fc01850a 100644 --- a/lib/icinga/timeperiod.hpp +++ b/lib/icinga/timeperiod.hpp @@ -37,16 +37,16 @@ public: DECLARE_OBJECT(TimePeriod); DECLARE_OBJECTNAME(TimePeriod); - virtual void Start(bool runtimeCreated) override; + void Start(bool runtimeCreated) override; void UpdateRegion(double begin, double end, bool clearExisting); - virtual bool GetIsInside() const override; + bool GetIsInside() const override; bool IsInside(double ts) const; double FindNextTransition(double begin); - virtual void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; private: void AddSegment(double s, double end); diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp index 699f66a57..527777cec 100644 --- a/lib/icinga/user.hpp +++ b/lib/icinga/user.hpp @@ -44,14 +44,14 @@ public: /* Notifications */ TimePeriod::Ptr GetPeriod() const; - virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; - virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void Stop(bool runtimeRemoved) override; + void Stop(bool runtimeRemoved) override; - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; private: mutable boost::mutex m_UserMutex; }; diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp index abf1bc51f..9d7303038 100644 --- a/lib/livestatus/andfilter.hpp +++ b/lib/livestatus/andfilter.hpp @@ -37,7 +37,7 @@ public: AndFilter(); - virtual bool Apply(const Table::Ptr& table, const Value& row) override; + bool Apply(const Table::Ptr& table, const Value& row) override; }; } diff --git a/lib/livestatus/attributefilter.hpp b/lib/livestatus/attributefilter.hpp index a3fb1c161..c3a607192 100644 --- a/lib/livestatus/attributefilter.hpp +++ b/lib/livestatus/attributefilter.hpp @@ -37,7 +37,7 @@ public: AttributeFilter(const String& column, const String& op, const String& operand); - virtual bool Apply(const Table::Ptr& table, const Value& row) override; + bool Apply(const Table::Ptr& table, const Value& row) override; protected: String m_Column; diff --git a/lib/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp index eec57e392..592ac50d4 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -49,8 +49,8 @@ public: AvgAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_AvgAttr; diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp index b06033dc1..3589f969f 100644 --- a/lib/livestatus/commandstable.hpp +++ b/lib/livestatus/commandstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value LineAccessor(const Value& row); diff --git a/lib/livestatus/commentstable.hpp b/lib/livestatus/commentstable.hpp index 4de5e2c8a..f6dbf7dc8 100644 --- a/lib/livestatus/commentstable.hpp +++ b/lib/livestatus/commentstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; private: static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/contactgroupstable.hpp b/lib/livestatus/contactgroupstable.hpp index e0eed78e0..f8e46390d 100644 --- a/lib/livestatus/contactgroupstable.hpp +++ b/lib/livestatus/contactgroupstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/contactstable.hpp b/lib/livestatus/contactstable.hpp index e42c9c023..4c4816c0c 100644 --- a/lib/livestatus/contactstable.hpp +++ b/lib/livestatus/contactstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/countaggregator.hpp b/lib/livestatus/countaggregator.hpp index 3b2bac401..22e110cd6 100644 --- a/lib/livestatus/countaggregator.hpp +++ b/lib/livestatus/countaggregator.hpp @@ -46,8 +46,8 @@ class CountAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(CountAggregator); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: static CountAggregatorState *EnsureState(AggregatorState **state); diff --git a/lib/livestatus/downtimestable.hpp b/lib/livestatus/downtimestable.hpp index b9e4d3d4d..9b3ca2a96 100644 --- a/lib/livestatus/downtimestable.hpp +++ b/lib/livestatus/downtimestable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; private: static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/endpointstable.hpp b/lib/livestatus/endpointstable.hpp index c42634207..ced85cfe5 100644 --- a/lib/livestatus/endpointstable.hpp +++ b/lib/livestatus/endpointstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value IdentityAccessor(const Value& row); diff --git a/lib/livestatus/hostgroupstable.hpp b/lib/livestatus/hostgroupstable.hpp index 1b0e7182b..91d2847a1 100644 --- a/lib/livestatus/hostgroupstable.hpp +++ b/lib/livestatus/hostgroupstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/hoststable.hpp b/lib/livestatus/hoststable.hpp index 8653c9b96..c6e34bb3b 100644 --- a/lib/livestatus/hoststable.hpp +++ b/lib/livestatus/hoststable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject); diff --git a/lib/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp index c471de5cd..3bfb389d1 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -49,8 +49,8 @@ public: InvAvgAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_InvAvgAttr; diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index 1ddc1fc8d..43804ac28 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -48,8 +48,8 @@ public: InvSumAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_InvSumAttr; diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp index a5a1abae2..b917bb3e4 100644 --- a/lib/livestatus/livestatuslistener.hpp +++ b/lib/livestatus/livestatuslistener.hpp @@ -45,11 +45,11 @@ public: static int GetClientsConnected(); static int GetConnections(); - virtual void ValidateSocketType(const String& value, const ValidationUtils& utils) override; + void ValidateSocketType(const String& value, const ValidationUtils& utils) override; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: void ServerThreadProc(); diff --git a/lib/livestatus/logtable.hpp b/lib/livestatus/logtable.hpp index 1864660f7..aab3e1f0e 100644 --- a/lib/livestatus/logtable.hpp +++ b/lib/livestatus/logtable.hpp @@ -41,13 +41,13 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp index 8dcf861bc..9515c3d71 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -48,8 +48,8 @@ public: MaxAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_MaxAttr; diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index 93767c798..a703474f1 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -49,8 +49,8 @@ public: MinAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_MinAttr; diff --git a/lib/livestatus/negatefilter.hpp b/lib/livestatus/negatefilter.hpp index 6bc50e3b0..f0744a11d 100644 --- a/lib/livestatus/negatefilter.hpp +++ b/lib/livestatus/negatefilter.hpp @@ -37,7 +37,7 @@ public: NegateFilter(const Filter::Ptr& inner); - virtual bool Apply(const Table::Ptr& table, const Value& row) override; + bool Apply(const Table::Ptr& table, const Value& row) override; private: Filter::Ptr m_Inner; diff --git a/lib/livestatus/orfilter.hpp b/lib/livestatus/orfilter.hpp index a1a375eeb..be308ecf6 100644 --- a/lib/livestatus/orfilter.hpp +++ b/lib/livestatus/orfilter.hpp @@ -37,7 +37,7 @@ public: OrFilter(); - virtual bool Apply(const Table::Ptr& table, const Value& row) override; + bool Apply(const Table::Ptr& table, const Value& row) override; }; } diff --git a/lib/livestatus/servicegroupstable.hpp b/lib/livestatus/servicegroupstable.hpp index a882f1292..4f97f8a4e 100644 --- a/lib/livestatus/servicegroupstable.hpp +++ b/lib/livestatus/servicegroupstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp index d5de376b4..665557236 100644 --- a/lib/livestatus/servicestable.hpp +++ b/lib/livestatus/servicestable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject); diff --git a/lib/livestatus/statehisttable.hpp b/lib/livestatus/statehisttable.hpp index d8fbd4217..5ef4027e7 100644 --- a/lib/livestatus/statehisttable.hpp +++ b/lib/livestatus/statehisttable.hpp @@ -42,13 +42,13 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/statustable.hpp b/lib/livestatus/statustable.hpp index ceb485c12..9edc9e3b8 100644 --- a/lib/livestatus/statustable.hpp +++ b/lib/livestatus/statustable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value ConnectionsAccessor(const Value& row); static Value ConnectionsRateAccessor(const Value& row); diff --git a/lib/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp index 148551915..baadf3165 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -50,8 +50,8 @@ public: StdAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_StdAttr; diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index 4630aad10..9215899ea 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -48,8 +48,8 @@ public: SumAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_SumAttr; diff --git a/lib/livestatus/timeperiodstable.hpp b/lib/livestatus/timeperiodstable.hpp index eae3b3c80..ee05cc4e3 100644 --- a/lib/livestatus/timeperiodstable.hpp +++ b/lib/livestatus/timeperiodstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/zonestable.hpp b/lib/livestatus/zonestable.hpp index e81ba2b93..7c223da48 100644 --- a/lib/livestatus/zonestable.hpp +++ b/lib/livestatus/zonestable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value ParentAccessor(const Value& row); diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp index 0278916cd..ed7d270d3 100644 --- a/lib/notification/notificationcomponent.hpp +++ b/lib/notification/notificationcomponent.hpp @@ -39,8 +39,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Timer::Ptr m_NotificationTimer; diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp index fe484da07..604ae757c 100644 --- a/lib/perfdata/elasticsearchwriter.hpp +++ b/lib/perfdata/elasticsearchwriter.hpp @@ -42,9 +42,9 @@ public: static String FormatTimestamp(double ts); protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: String m_EventPrefix; diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp index 7b75e88f3..261046e4e 100644 --- a/lib/perfdata/gelfwriter.hpp +++ b/lib/perfdata/gelfwriter.hpp @@ -47,9 +47,9 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Stream::Ptr m_Stream; diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp index 9fed91629..7c0606580 100644 --- a/lib/perfdata/graphitewriter.hpp +++ b/lib/perfdata/graphitewriter.hpp @@ -46,13 +46,13 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateHostNameTemplate(const String& value, const ValidationUtils& utils) override; - virtual void ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateHostNameTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils) override; protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Stream::Ptr m_Stream; diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp index 2576a4b84..cf7be26ff 100644 --- a/lib/perfdata/influxdbwriter.hpp +++ b/lib/perfdata/influxdbwriter.hpp @@ -46,13 +46,13 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateHostTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; - virtual void ValidateServiceTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateHostTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateServiceTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: WorkQueue m_WorkQueue; diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp index 069588e8d..5862a479a 100644 --- a/lib/perfdata/opentsdbwriter.hpp +++ b/lib/perfdata/opentsdbwriter.hpp @@ -44,8 +44,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Stream::Ptr m_Stream; diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp index 8c6726fdd..64bd36fb5 100644 --- a/lib/perfdata/perfdatawriter.hpp +++ b/lib/perfdata/perfdatawriter.hpp @@ -42,12 +42,12 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateHostFormatTemplate(const String& value, const ValidationUtils& utils) override; - virtual void ValidateServiceFormatTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateHostFormatTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateServiceFormatTemplate(const String& value, const ValidationUtils& utils) override; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); diff --git a/lib/remote/actionshandler.hpp b/lib/remote/actionshandler.hpp index 2e6d4e099..dd5ab9032 100644 --- a/lib/remote/actionshandler.hpp +++ b/lib/remote/actionshandler.hpp @@ -30,7 +30,7 @@ class ActionsHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ActionsHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp index 8224bb6d0..81b1310d3 100644 --- a/lib/remote/apilistener.hpp +++ b/lib/remote/apilistener.hpp @@ -109,12 +109,12 @@ public: static String GetDefaultCaPath(); protected: - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeDeleted) override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeDeleted) override; - virtual void ValidateTlsProtocolmin(const String& value, const ValidationUtils& utils) override; + void ValidateTlsProtocolmin(const String& value, const ValidationUtils& utils) override; private: std::shared_ptr m_SSLContext; diff --git a/lib/remote/configfileshandler.hpp b/lib/remote/configfileshandler.hpp index 452abbc33..8551aeb9d 100644 --- a/lib/remote/configfileshandler.hpp +++ b/lib/remote/configfileshandler.hpp @@ -30,7 +30,7 @@ class ConfigFilesHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigFilesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/configpackageshandler.hpp b/lib/remote/configpackageshandler.hpp index f7898943d..c57a33ee9 100644 --- a/lib/remote/configpackageshandler.hpp +++ b/lib/remote/configpackageshandler.hpp @@ -30,7 +30,7 @@ class ConfigPackagesHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigPackagesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; private: diff --git a/lib/remote/configstageshandler.hpp b/lib/remote/configstageshandler.hpp index 4366c58c1..159856e51 100644 --- a/lib/remote/configstageshandler.hpp +++ b/lib/remote/configstageshandler.hpp @@ -30,7 +30,7 @@ class ConfigStagesHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigStagesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; private: diff --git a/lib/remote/consolehandler.hpp b/lib/remote/consolehandler.hpp index 726543faa..ce7ae8f33 100644 --- a/lib/remote/consolehandler.hpp +++ b/lib/remote/consolehandler.hpp @@ -43,7 +43,7 @@ class ConsoleHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConsoleHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; static std::vector GetAutocompletionSuggestions(const String& word, ScriptFrame& frame); diff --git a/lib/remote/createobjecthandler.hpp b/lib/remote/createobjecthandler.hpp index 6cda7a289..12dc12377 100644 --- a/lib/remote/createobjecthandler.hpp +++ b/lib/remote/createobjecthandler.hpp @@ -30,7 +30,7 @@ class CreateObjectHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(CreateObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/deleteobjecthandler.hpp b/lib/remote/deleteobjecthandler.hpp index ecf4e8e5d..77e68ea5b 100644 --- a/lib/remote/deleteobjecthandler.hpp +++ b/lib/remote/deleteobjecthandler.hpp @@ -30,7 +30,7 @@ class DeleteObjectHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(DeleteObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp index 37420a511..fa43310c0 100644 --- a/lib/remote/endpoint.hpp +++ b/lib/remote/endpoint.hpp @@ -53,7 +53,7 @@ public: intrusive_ptr GetZone() const; - virtual bool GetConnected() const override; + bool GetConnected() const override; static Endpoint::Ptr GetLocalEndpoint(); @@ -69,7 +69,7 @@ public: double GetBytesReceivedPerSecond() const override; protected: - virtual void OnAllConfigLoaded() override; + void OnAllConfigLoaded() override; private: mutable boost::mutex m_ClientsLock; diff --git a/lib/remote/eventshandler.hpp b/lib/remote/eventshandler.hpp index 69ce7cb97..0e89972e9 100644 --- a/lib/remote/eventshandler.hpp +++ b/lib/remote/eventshandler.hpp @@ -31,7 +31,7 @@ class EventsHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(EventsHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/filterutility.hpp b/lib/remote/filterutility.hpp index 0e6a4ace8..e2c69dfc3 100644 --- a/lib/remote/filterutility.hpp +++ b/lib/remote/filterutility.hpp @@ -46,10 +46,10 @@ class ConfigObjectTargetProvider final : public TargetProvider public: DECLARE_PTR_TYPEDEFS(ConfigObjectTargetProvider); - virtual void FindTargets(const String& type, const std::function& addTarget) const override; - virtual Value GetTargetByName(const String& type, const String& name) const override; - virtual bool IsValidType(const String& type) const override; - virtual String GetPluralName(const String& type) const override; + void FindTargets(const String& type, const std::function& addTarget) const override; + Value GetTargetByName(const String& type, const String& name) const override; + bool IsValidType(const String& type) const override; + String GetPluralName(const String& type) const override; }; struct QueryDescription diff --git a/lib/remote/infohandler.hpp b/lib/remote/infohandler.hpp index 52bb8ba8e..f99eab5c8 100644 --- a/lib/remote/infohandler.hpp +++ b/lib/remote/infohandler.hpp @@ -30,7 +30,7 @@ class InfoHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(InfoHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/modifyobjecthandler.hpp b/lib/remote/modifyobjecthandler.hpp index 0ed717975..c5583ac44 100644 --- a/lib/remote/modifyobjecthandler.hpp +++ b/lib/remote/modifyobjecthandler.hpp @@ -30,7 +30,7 @@ class ModifyObjectHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ModifyObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/objectqueryhandler.hpp b/lib/remote/objectqueryhandler.hpp index 6e0b020ce..acefdb63b 100644 --- a/lib/remote/objectqueryhandler.hpp +++ b/lib/remote/objectqueryhandler.hpp @@ -30,7 +30,7 @@ class ObjectQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ObjectQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; private: diff --git a/lib/remote/statushandler.cpp b/lib/remote/statushandler.cpp index 96f044b64..03627f513 100644 --- a/lib/remote/statushandler.cpp +++ b/lib/remote/statushandler.cpp @@ -32,7 +32,7 @@ class StatusTargetProvider final : public TargetProvider public: DECLARE_PTR_TYPEDEFS(StatusTargetProvider); - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { Dictionary::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty); @@ -45,7 +45,7 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { Dictionary::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty); @@ -70,12 +70,12 @@ public: return result; } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { return type == "Status"; } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return "statuses"; } diff --git a/lib/remote/statushandler.hpp b/lib/remote/statushandler.hpp index 70f72b586..7dfa8380e 100644 --- a/lib/remote/statushandler.hpp +++ b/lib/remote/statushandler.hpp @@ -30,7 +30,7 @@ class StatusHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(StatusHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/templatequeryhandler.cpp b/lib/remote/templatequeryhandler.cpp index 9406e3645..6dd5b2d89 100644 --- a/lib/remote/templatequeryhandler.cpp +++ b/lib/remote/templatequeryhandler.cpp @@ -54,7 +54,7 @@ public: return target; } - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { Type::Ptr ptype = Type::GetByName(type); @@ -65,7 +65,7 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(type); @@ -77,7 +77,7 @@ public: return GetTargetForTemplate(item); } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { Type::Ptr ptype = Type::GetByName(type); @@ -87,7 +87,7 @@ public: return ConfigObject::TypeInstance->IsAssignableFrom(ptype); } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return Type::GetByName(type)->GetPluralName(); } diff --git a/lib/remote/templatequeryhandler.hpp b/lib/remote/templatequeryhandler.hpp index 4c3e7c1ae..a70188b2a 100644 --- a/lib/remote/templatequeryhandler.hpp +++ b/lib/remote/templatequeryhandler.hpp @@ -30,7 +30,7 @@ class TemplateQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(TemplateQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/typequeryhandler.cpp b/lib/remote/typequeryhandler.cpp index 991d5e156..2a26e3be2 100644 --- a/lib/remote/typequeryhandler.cpp +++ b/lib/remote/typequeryhandler.cpp @@ -35,7 +35,7 @@ class TypeTargetProvider final : public TargetProvider public: DECLARE_PTR_TYPEDEFS(TypeTargetProvider); - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { for (const Type::Ptr& target : Type::GetAllTypes()) { @@ -43,7 +43,7 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(name); @@ -53,12 +53,12 @@ public: return ptype; } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { return type == "Type"; } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return "types"; } diff --git a/lib/remote/typequeryhandler.hpp b/lib/remote/typequeryhandler.hpp index 177cf7419..11e533efd 100644 --- a/lib/remote/typequeryhandler.hpp +++ b/lib/remote/typequeryhandler.hpp @@ -30,7 +30,7 @@ class TypeQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(TypeQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/variablequeryhandler.cpp b/lib/remote/variablequeryhandler.cpp index 9fbfa5893..416170962 100644 --- a/lib/remote/variablequeryhandler.cpp +++ b/lib/remote/variablequeryhandler.cpp @@ -45,7 +45,7 @@ public: return target; } - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { { @@ -57,17 +57,17 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { return GetTargetForVar(name, ScriptGlobal::Get(name)); } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { return type == "Variable"; } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return "variables"; } diff --git a/lib/remote/variablequeryhandler.hpp b/lib/remote/variablequeryhandler.hpp index 884ed53a3..6ce4dacc1 100644 --- a/lib/remote/variablequeryhandler.hpp +++ b/lib/remote/variablequeryhandler.hpp @@ -30,7 +30,7 @@ class VariableQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(VariableQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/zone.hpp b/lib/remote/zone.hpp index 83022a30f..dd5918641 100644 --- a/lib/remote/zone.hpp +++ b/lib/remote/zone.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(Zone); DECLARE_OBJECTNAME(Zone); - virtual void OnAllConfigLoaded() override; + void OnAllConfigLoaded() override; Zone::Ptr GetParent() const; std::set GetEndpoints() const; @@ -50,7 +50,7 @@ public: static Zone::Ptr GetLocalZone(); protected: - virtual void ValidateEndpointsRaw(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateEndpointsRaw(const Array::Ptr& value, const ValidationUtils& utils) override; private: Zone::Ptr m_Parent; diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 62eb02e0f..047d4670b 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -221,7 +221,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "public:" << std::endl << "\t" << "DECLARE_PTR_TYPEDEFS(TypeImpl<" << klass.Name << ">);" << std::endl << std::endl << "\t" << "TypeImpl();" << std::endl - << "\t" << "~TypeImpl();" << std::endl << std::endl; + << "\t" << "~TypeImpl() override;" << std::endl << std::endl; m_Impl << "TypeImpl<" << klass.Name << ">::TypeImpl()" << std::endl << "{ }" << std::endl << std::endl @@ -229,7 +229,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "{ }" << std::endl << std::endl; /* GetName */ - m_Header << "\t" << "virtual String GetName() const;" << std::endl; + m_Header << "\t" << "String GetName() const override;" << std::endl; m_Impl << "String TypeImpl<" << klass.Name << ">::GetName() const" << std::endl << "{" << std::endl @@ -237,7 +237,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetAttributes */ - m_Header << "\t" << "virtual int GetAttributes() const;" << std::endl; + m_Header << "\t" << "int GetAttributes() const override;" << std::endl; m_Impl << "int TypeImpl<" << klass.Name << ">::GetAttributes() const" << std::endl << "{" << std::endl @@ -245,7 +245,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetBaseType */ - m_Header << "\t" << "virtual Type::Ptr GetBaseType() const;" << std::endl; + m_Header << "\t" << "Type::Ptr GetBaseType() const override;" << std::endl; m_Impl << "Type::Ptr TypeImpl<" << klass.Name << ">::GetBaseType() const" << std::endl << "{" << std::endl @@ -260,7 +260,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFieldId */ - m_Header << "\t" << "virtual int GetFieldId(const String& name) const;" << std::endl; + m_Header << "\t" << "int GetFieldId(const String& name) const override;" << std::endl; m_Impl << "int TypeImpl<" << klass.Name << ">::GetFieldId(const String& name) const" << std::endl << "{" << std::endl; @@ -327,7 +327,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFieldInfo */ - m_Header << "\t" << "virtual Field GetFieldInfo(int id) const;" << std::endl; + m_Header << "\t" << "Field GetFieldInfo(int id) const override;" << std::endl; m_Impl << "Field TypeImpl<" << klass.Name << ">::GetFieldInfo(int id) const" << std::endl << "{" << std::endl; @@ -374,7 +374,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) m_Impl << "}" << std::endl << std::endl; /* GetFieldCount */ - m_Header << "\t" << "virtual int GetFieldCount() const;" << std::endl; + m_Header << "\t" << "int GetFieldCount() const override;" << std::endl; m_Impl << "int TypeImpl<" << klass.Name << ">::GetFieldCount() const" << std::endl << "{" << std::endl @@ -387,7 +387,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFactory */ - m_Header << "\t" << "virtual ObjectFactory GetFactory() const;" << std::endl; + m_Header << "\t" << "ObjectFactory GetFactory() const override;" << std::endl; m_Impl << "ObjectFactory TypeImpl<" << klass.Name << ">::GetFactory() const" << std::endl << "{" << std::endl @@ -395,7 +395,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetLoadDependencies */ - m_Header << "\t" << "virtual std::vector GetLoadDependencies() const;" << std::endl; + m_Header << "\t" << "std::vector GetLoadDependencies() const override;" << std::endl; m_Impl << "std::vector TypeImpl<" << klass.Name << ">::GetLoadDependencies() const" << std::endl << "{" << std::endl @@ -409,7 +409,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* RegisterAttributeHandler */ m_Header << "public:" << std::endl - << "\t" << "virtual void RegisterAttributeHandler(int fieldId, const Type::AttributeHandler& callback);" << std::endl; + << "\t" << "void RegisterAttributeHandler(int fieldId, const Type::AttributeHandler& callback) override;" << std::endl; m_Impl << "void TypeImpl<" << klass.Name << ">::RegisterAttributeHandler(int fieldId, const Type::AttributeHandler& callback)" << std::endl << "{" << std::endl; @@ -459,7 +459,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "\t" << "DECLARE_PTR_TYPEDEFS(ObjectImpl<" << klass.Name << ">);" << std::endl << std::endl; /* Validate */ - m_Header << "\t" << "virtual void Validate(int types, const ValidationUtils& utils) override;" << std::endl; + m_Header << "\t" << "void Validate(int types, const ValidationUtils& utils) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::Validate(int types, const ValidationUtils& utils)" << std::endl << "{" << std::endl; @@ -563,7 +563,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* destructor */ m_Header << "public:" << std::endl - << "\t" << "~ObjectImpl<" << klass.Name << ">();" << std::endl; + << "\t" << "~ObjectImpl<" << klass.Name << ">() override;" << std::endl; m_Impl << "ObjectImpl<" << klass.Name << ">::~ObjectImpl()" << std::endl << "{ }" << std::endl << std::endl; @@ -571,7 +571,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) if (!klass.Fields.empty()) { /* SetField */ m_Header << "public:" << std::endl - << "\t" << "virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override;" << std::endl; + << "\t" << "void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::SetField(int id, const Value& value, bool suppress_events, const Value& cookie)" << std::endl << "{" << std::endl; @@ -615,7 +615,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* GetField */ m_Header << "public:" << std::endl - << "\t" << "virtual Value GetField(int id) const override;" << std::endl; + << "\t" << "Value GetField(int id) const override;" << std::endl; m_Impl << "Value ObjectImpl<" << klass.Name << ">::GetField(int id) const" << std::endl << "{" << std::endl; @@ -648,7 +648,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* ValidateField */ m_Header << "public:" << std::endl - << "\t" << "virtual void ValidateField(int id, const Value& value, const ValidationUtils& utils) override;" << std::endl; + << "\t" << "void ValidateField(int id, const Value& value, const ValidationUtils& utils) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::ValidateField(int id, const Value& value, const ValidationUtils& utils)" << std::endl << "{" << std::endl; @@ -726,7 +726,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* NavigateField */ m_Header << "public:" << std::endl - << "\t" << "virtual Object::Ptr NavigateField(int id) const override;" << std::endl; + << "\t" << "Object::Ptr NavigateField(int id) const override;" << std::endl; m_Impl << "Object::Ptr ObjectImpl<" << klass.Name << ">::NavigateField(int id) const" << std::endl << "{" << std::endl; @@ -963,8 +963,8 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* start/stop */ if (needs_tracking) { m_Header << "protected:" << std::endl - << "\tvirtual void Start(bool runtimeCreated = false) override;" << std::endl - << "\tvirtual void Stop(bool runtimeRemoved = false) override;" << std::endl; + << "\tvoid Start(bool runtimeCreated = false) override;" << std::endl + << "\tvoid Stop(bool runtimeRemoved = false) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::Start(bool runtimeCreated)" << std::endl << "{" << std::endl From 6da7d48d25277a2d828539817751c2004c99da24 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 08:15:20 +0100 Subject: [PATCH 03/12] Apply clang-tidy fix 'modernize-loop-convert' --- lib/base/process.cpp | 8 ++--- lib/base/threadpool.cpp | 52 ++++++++++++++++----------------- lib/db_ido/dbconnection.cpp | 8 ++--- tools/mkclass/classcompiler.hpp | 6 ++-- 4 files changed, 36 insertions(+), 38 deletions(-) diff --git a/lib/base/process.cpp b/lib/base/process.cpp index d8c381c7f..fef953dde 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -506,7 +506,7 @@ void Process::InitializeSpawnHelper() static void InitializeProcess() { - for (int tid = 0; tid < IOTHREADS; tid++) { + for (auto& l_EventFD : l_EventFDs) { #ifdef _WIN32 l_Events[tid] = CreateEvent(nullptr, TRUE, FALSE, nullptr); #else /* _WIN32 */ @@ -514,14 +514,14 @@ static void InitializeProcess() if (pipe2(l_EventFDs[tid], O_CLOEXEC) < 0) { if (errno == ENOSYS) { # endif /* HAVE_PIPE2 */ - if (pipe(l_EventFDs[tid]) < 0) { + if (pipe(l_EventFD) < 0) { BOOST_THROW_EXCEPTION(posix_error() << boost::errinfo_api_function("pipe") << boost::errinfo_errno(errno)); } - Utility::SetCloExec(l_EventFDs[tid][0]); - Utility::SetCloExec(l_EventFDs[tid][1]); + Utility::SetCloExec(l_EventFD[0]); + Utility::SetCloExec(l_EventFD[1]); # ifdef HAVE_PIPE2 } else { BOOST_THROW_EXCEPTION(posix_error() diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index cca32652d..4872652ec 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -50,8 +50,8 @@ void ThreadPool::Start() m_Stopped = false; - for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++) - m_Queues[i].SpawnWorker(m_ThreadGroup); + for (auto& queue : m_Queues) + queue.SpawnWorker(m_ThreadGroup); m_MgmtThread = std::thread(std::bind(&ThreadPool::ManagerThreadProc, this)); } @@ -70,18 +70,18 @@ void ThreadPool::Stop() if (m_MgmtThread.joinable()) m_MgmtThread.join(); - for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++) { - boost::mutex::scoped_lock lock(m_Queues[i].Mutex); - m_Queues[i].Stopped = true; - m_Queues[i].CV.notify_all(); + for (auto& queue : m_Queues) { + boost::mutex::scoped_lock lock(queue.Mutex); + queue.Stopped = true; + queue.CV.notify_all(); } m_ThreadGroup.join_all(); m_ThreadGroup.~thread_group(); new (&m_ThreadGroup) boost::thread_group(); - for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++) - m_Queues[i].Stopped = false; + for (auto& queue : m_Queues) + queue.Stopped = false; m_Stopped = true; } @@ -242,24 +242,22 @@ void ThreadPool::ManagerThreadProc() break; } - for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++) { + for (auto& queue : m_Queues) { size_t pending, alive = 0; double avg_latency; double utilization = 0; - Queue& queue = m_Queues[i]; + boost::mutex::scoped_lock lock(queue.Mutex); - boost::mutex::scoped_lock lock(queue.Mutex); - - for (size_t i = 0; i < sizeof(queue.Threads) / sizeof(queue.Threads[0]); i++) - queue.Threads[i].UpdateUtilization(); + for (auto& thread : queue.Threads) + thread.UpdateUtilization(); pending = queue.Items.size(); - for (size_t i = 0; i < sizeof(queue.Threads) / sizeof(queue.Threads[0]); i++) { - if (queue.Threads[i].State != ThreadDead && !queue.Threads[i].Zombie) { + for (auto& thread : queue.Threads) { + if (thread.State != ThreadDead && !thread.Zombie) { alive++; - utilization += queue.Threads[i].Utilization * 100; + utilization += thread.Utilization * 100; } } @@ -331,12 +329,12 @@ void ThreadPool::ManagerThreadProc() */ void ThreadPool::Queue::SpawnWorker(boost::thread_group& group) { - for (size_t i = 0; i < sizeof(Threads) / sizeof(Threads[0]); i++) { - if (Threads[i].State == ThreadDead) { + for (auto& thread : Threads) { + if (thread.State == ThreadDead) { Log(LogDebug, "ThreadPool", "Spawning worker thread."); - Threads[i] = WorkerThread(ThreadIdle); - Threads[i].Thread = group.create_thread(std::bind(&ThreadPool::WorkerThread::ThreadProc, std::ref(Threads[i]), std::ref(*this))); + thread = WorkerThread(ThreadIdle); + thread.Thread = group.create_thread(std::bind(&ThreadPool::WorkerThread::ThreadProc, std::ref(thread), std::ref(*this))); break; } @@ -348,15 +346,15 @@ void ThreadPool::Queue::SpawnWorker(boost::thread_group& group) */ void ThreadPool::Queue::KillWorker(boost::thread_group& group) { - for (size_t i = 0; i < sizeof(Threads) / sizeof(Threads[0]); i++) { - if (Threads[i].State == ThreadIdle && !Threads[i].Zombie) { + for (auto& thread : Threads) { + if (thread.State == ThreadIdle && !thread.Zombie) { Log(LogDebug, "ThreadPool", "Killing worker thread."); - group.remove_thread(Threads[i].Thread); - Threads[i].Thread->detach(); - delete Threads[i].Thread; + group.remove_thread(thread.Thread); + thread.Thread->detach(); + delete thread.Thread; - Threads[i].Zombie = true; + thread.Zombie = true; CV.notify_all(); break; diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index fd1581f16..ddbf76ff3 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -229,15 +229,15 @@ void DbConnection::CleanUpHandler() { "systemcommands", "start_time" } }; - for (size_t i = 0; i < sizeof(tables) / sizeof(tables[0]); i++) { - double max_age = GetCleanup()->Get(tables[i].name + "_age"); + for (auto& table : tables) { + double max_age = GetCleanup()->Get(table.name + "_age"); if (max_age == 0) continue; - CleanUpExecuteQuery(tables[i].name, tables[i].time_column, now - max_age); + CleanUpExecuteQuery(table.name, table.time_column, now - max_age); Log(LogNotice, "DbConnection") - << "Cleanup (" << tables[i].name << "): " << max_age + << "Cleanup (" << table.name << "): " << max_age << " now: " << now << " old: " << now - max_age; } diff --git a/tools/mkclass/classcompiler.hpp b/tools/mkclass/classcompiler.hpp index f4b8f0ba9..67a50070d 100644 --- a/tools/mkclass/classcompiler.hpp +++ b/tools/mkclass/classcompiler.hpp @@ -138,14 +138,14 @@ struct Field bool cap = true; std::string name = Name; - for (size_t i = 0; i < name.size(); i++) { - if (name[i] == '_') { + for (char& ch : name) { + if (ch == '_') { cap = true; continue; } if (cap) { - name[i] = toupper(name[i]); + ch = toupper(ch); cap = false; } } From 621eed3f139bd71f96e1d819b2201c1034f73edc Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 08:54:18 +0100 Subject: [PATCH 04/12] Apply clang-tidy fix 'modernize-pass-by-value' --- lib/base/array.cpp | 24 +++--------- lib/base/array.hpp | 9 ++--- lib/base/configtype.hpp | 3 +- lib/base/configwriter.cpp | 4 +- lib/base/configwriter.hpp | 2 +- lib/base/dictionary.cpp | 19 ++-------- lib/base/dictionary.hpp | 7 ++-- lib/base/exception.cpp | 10 ++--- lib/base/exception.hpp | 6 +-- lib/base/function.cpp | 4 +- lib/base/function.hpp | 2 +- lib/base/loader.hpp | 4 +- lib/base/logger.cpp | 8 ++-- lib/base/logger.hpp | 4 +- lib/base/networkstream.cpp | 4 +- lib/base/networkstream.hpp | 2 +- lib/base/perfdatavalue.cpp | 2 +- lib/base/perfdatavalue.hpp | 2 +- lib/base/primitivetype.cpp | 4 +- lib/base/primitivetype.hpp | 2 +- lib/base/process.cpp | 4 +- lib/base/process.hpp | 2 +- lib/base/scriptframe.cpp | 4 +- lib/base/scriptframe.hpp | 2 +- lib/base/string.cpp | 6 +-- lib/base/string.hpp | 3 +- lib/cli/consolecommand.cpp | 4 +- lib/cli/consolecommand.hpp | 4 +- lib/cli/troubleshootcommand.cpp | 4 +- lib/config/activationcontext.cpp | 4 +- lib/config/activationcontext.hpp | 2 +- lib/config/applyrule.cpp | 10 ++--- lib/config/applyrule.hpp | 6 +-- lib/config/configcompiler.cpp | 11 +++--- lib/config/configcompiler.hpp | 4 +- lib/config/configitem.cpp | 18 ++++----- lib/config/configitem.hpp | 12 +++--- lib/config/expression.cpp | 4 +- lib/config/expression.hpp | 50 ++++++++++++------------- lib/db_ido/dbevents.cpp | 2 +- lib/db_ido/dbevents.hpp | 2 +- lib/db_ido/dbobject.cpp | 4 +- lib/db_ido/dbobject.hpp | 2 +- lib/db_ido/dbtype.cpp | 4 +- lib/db_ido/dbtype.hpp | 2 +- lib/db_ido/dbvalue.cpp | 4 +- lib/db_ido/dbvalue.hpp | 2 +- lib/db_ido_mysql/idomysqlconnection.cpp | 3 +- lib/db_ido_pgsql/idopgsqlconnection.cpp | 3 +- lib/icinga/compatutility.cpp | 4 +- lib/icinga/compatutility.hpp | 4 +- lib/icinga/scheduleddowntime.hpp | 1 - lib/icinga/service.hpp | 1 - lib/livestatus/attributefilter.cpp | 4 +- lib/livestatus/attributefilter.hpp | 2 +- lib/livestatus/avgaggregator.cpp | 4 +- lib/livestatus/avgaggregator.hpp | 2 +- lib/livestatus/column.cpp | 4 +- lib/livestatus/column.hpp | 2 +- lib/livestatus/filter.hpp | 2 +- lib/livestatus/invavgaggregator.cpp | 4 +- lib/livestatus/invavgaggregator.hpp | 2 +- lib/livestatus/invsumaggregator.cpp | 4 +- lib/livestatus/invsumaggregator.hpp | 2 +- lib/livestatus/livestatusquery.cpp | 2 +- lib/livestatus/maxaggregator.cpp | 4 +- lib/livestatus/maxaggregator.hpp | 2 +- lib/livestatus/minaggregator.cpp | 4 +- lib/livestatus/minaggregator.hpp | 2 +- lib/livestatus/negatefilter.cpp | 4 +- lib/livestatus/negatefilter.hpp | 2 +- lib/livestatus/stdaggregator.cpp | 4 +- lib/livestatus/stdaggregator.hpp | 2 +- lib/livestatus/sumaggregator.cpp | 4 +- lib/livestatus/sumaggregator.hpp | 2 +- lib/livestatus/zonestable.cpp | 2 +- lib/methods/icingachecktask.cpp | 2 +- lib/perfdata/elasticsearchwriter.cpp | 5 ++- lib/perfdata/elasticsearchwriter.hpp | 2 +- lib/perfdata/gelfwriter.cpp | 3 +- lib/perfdata/graphitewriter.cpp | 3 +- lib/perfdata/influxdbwriter.cpp | 3 +- lib/remote/apiaction.cpp | 4 +- lib/remote/apiaction.hpp | 2 +- lib/remote/apiclient.cpp | 4 +- lib/remote/apiclient.hpp | 2 +- lib/remote/apifunction.cpp | 4 +- lib/remote/apifunction.hpp | 2 +- lib/remote/eventqueue.cpp | 4 +- lib/remote/eventqueue.hpp | 2 +- lib/remote/httpclientconnection.cpp | 4 +- lib/remote/httpclientconnection.hpp | 2 +- lib/remote/httprequest.cpp | 4 +- lib/remote/httprequest.hpp | 2 +- lib/remote/httpresponse.cpp | 4 +- lib/remote/httpresponse.hpp | 2 +- lib/remote/jsonrpcconnection.cpp | 4 +- lib/remote/jsonrpcconnection.hpp | 2 +- lib/remote/url.cpp | 6 +-- tools/mkclass/classcompiler.cpp | 5 ++- tools/mkclass/classcompiler.hpp | 7 ++-- 101 files changed, 220 insertions(+), 244 deletions(-) diff --git a/lib/base/array.cpp b/lib/base/array.cpp index 202c9aee8..dad3d39bc 100644 --- a/lib/base/array.cpp +++ b/lib/base/array.cpp @@ -86,23 +86,11 @@ void Array::Set(SizeType index, Value&& value) * * @param value The value. */ -void Array::Add(const Value& value) +void Array::Add(Value value) { ObjectLock olock(this); - m_Data.push_back(value); -} - -/** - * Adds a value to the array. - * - * @param value The value. - */ -void Array::Add(Value&& value) -{ - ObjectLock olock(this); - - m_Data.emplace_back(std::move(value)); + m_Data.push_back(std::move(value)); } /** @@ -164,13 +152,13 @@ bool Array::Contains(const Value& value) const * @param index The index * @param value The value to add */ -void Array::Insert(SizeType index, const Value& value) +void Array::Insert(SizeType index, Value value) { ObjectLock olock(this); ASSERT(index <= m_Data.size()); - m_Data.insert(m_Data.begin() + index, value); + m_Data.insert(m_Data.begin() + index, std::move(value)); } /** @@ -314,12 +302,12 @@ void Array::SetFieldByName(const String& field, const Value& value, const DebugI Set(index, value); } -Array::Iterator icinga::begin(Array::Ptr x) +Array::Iterator icinga::begin(const Array::Ptr& x) { return x->Begin(); } -Array::Iterator icinga::end(Array::Ptr x) +Array::Iterator icinga::end(const Array::Ptr& x) { return x->End(); } diff --git a/lib/base/array.hpp b/lib/base/array.hpp index 716d09683..c14d95c5e 100644 --- a/lib/base/array.hpp +++ b/lib/base/array.hpp @@ -55,8 +55,7 @@ public: Value Get(SizeType index) const; void Set(SizeType index, const Value& value); void Set(SizeType index, Value&& value); - void Add(const Value& value); - void Add(Value&& value); + void Add(Value value); Iterator Begin(); Iterator End(); @@ -64,7 +63,7 @@ public: size_t GetLength() const; bool Contains(const Value& value) const; - void Insert(SizeType index, const Value& value); + void Insert(SizeType index, Value value); void Remove(SizeType index); void Remove(Iterator it); @@ -118,8 +117,8 @@ private: std::vector m_Data; /**< The data for the array. */ }; -Array::Iterator begin(Array::Ptr x); -Array::Iterator end(Array::Ptr x); +Array::Iterator begin(const Array::Ptr& x); +Array::Iterator end(const Array::Ptr& x); } diff --git a/lib/base/configtype.hpp b/lib/base/configtype.hpp index cf7f2b963..b81ed5e1c 100644 --- a/lib/base/configtype.hpp +++ b/lib/base/configtype.hpp @@ -54,7 +54,8 @@ public: { std::vector > objects = GetObjectsHelper(T::TypeInstance.get()); std::vector > result; - for (const auto& object : objects) { + result.reserve(objects.size()); +for (const auto& object : objects) { result.push_back(static_pointer_cast(object)); } return result; diff --git a/lib/base/configwriter.cpp b/lib/base/configwriter.cpp index 364e2518e..22fafde32 100644 --- a/lib/base/configwriter.cpp +++ b/lib/base/configwriter.cpp @@ -269,8 +269,8 @@ const std::vector& ConfigWriter::GetKeywords() return keywords; } -ConfigIdentifier::ConfigIdentifier(const String& identifier) - : m_Name(identifier) +ConfigIdentifier::ConfigIdentifier(String identifier) + : m_Name(std::move(identifier)) { } String ConfigIdentifier::GetName() const diff --git a/lib/base/configwriter.hpp b/lib/base/configwriter.hpp index 2649b8536..0ae4d92a5 100644 --- a/lib/base/configwriter.hpp +++ b/lib/base/configwriter.hpp @@ -38,7 +38,7 @@ class ConfigIdentifier final : public Object public: DECLARE_PTR_TYPEDEFS(ConfigIdentifier); - ConfigIdentifier(const String& name); + ConfigIdentifier(String name); String GetName() const; diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp index 76c9b2b4a..6726150c0 100644 --- a/lib/base/dictionary.cpp +++ b/lib/base/dictionary.cpp @@ -79,20 +79,7 @@ bool Dictionary::Get(const String& key, Value *result) const * @param key The key. * @param value The value. */ -void Dictionary::Set(const String& key, const Value& value) -{ - ObjectLock olock(this); - - m_Data[key] = value; -} - -/** - * Sets a value in the dictionary. - * - * @param key The key. - * @param value The value. - */ -void Dictionary::Set(const String& key, Value&& value) +void Dictionary::Set(const String& key, Value value) { ObjectLock olock(this); @@ -282,12 +269,12 @@ bool Dictionary::GetOwnField(const String& field, Value *result) const return Get(field, result); } -Dictionary::Iterator icinga::begin(Dictionary::Ptr x) +Dictionary::Iterator icinga::begin(const Dictionary::Ptr& x) { return x->Begin(); } -Dictionary::Iterator icinga::end(Dictionary::Ptr x) +Dictionary::Iterator icinga::end(const Dictionary::Ptr& x) { return x->End(); } diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp index b2627b486..26c7c6a23 100644 --- a/lib/base/dictionary.hpp +++ b/lib/base/dictionary.hpp @@ -55,8 +55,7 @@ public: Value Get(const String& key) const; bool Get(const String& key, Value *result) const; - void Set(const String& key, const Value& value); - void Set(const String& key, Value&& value); + void Set(const String& key, Value value); bool Contains(const String& key) const; Iterator Begin(); @@ -90,8 +89,8 @@ private: std::map m_Data; /**< The data for the dictionary. */ }; -Dictionary::Iterator begin(Dictionary::Ptr x); -Dictionary::Iterator end(Dictionary::Ptr x); +Dictionary::Iterator begin(const Dictionary::Ptr& x); +Dictionary::Iterator end(const Dictionary::Ptr& x); } diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 98bcd4241..ceddeecbe 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -260,7 +260,7 @@ String icinga::DiagnosticInformation(const std::exception& ex, bool verbose, Sta return result.str(); } -String icinga::DiagnosticInformation(boost::exception_ptr eptr, bool verbose) +String icinga::DiagnosticInformation(const boost::exception_ptr& eptr, bool verbose) { StackTrace *pt = GetLastExceptionStack(); StackTrace stack; @@ -283,12 +283,12 @@ String icinga::DiagnosticInformation(boost::exception_ptr eptr, bool verbose) return boost::diagnostic_information(eptr); } -ScriptError::ScriptError(const String& message) - : m_Message(message), m_IncompleteExpr(false) +ScriptError::ScriptError(String message) + : m_Message(std::move(message)), m_IncompleteExpr(false) { } -ScriptError::ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr) - : m_Message(message), m_DebugInfo(di), m_IncompleteExpr(incompleteExpr), m_HandledByDebugger(false) +ScriptError::ScriptError(String message, DebugInfo di, bool incompleteExpr) + : m_Message(std::move(message)), m_DebugInfo(std::move(di)), m_IncompleteExpr(incompleteExpr), m_HandledByDebugger(false) { } ScriptError::~ScriptError() throw() diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index 9c26c7468..208ac1d53 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -51,8 +51,8 @@ class user_error : virtual public std::exception, virtual public boost::exceptio class ScriptError : virtual public user_error { public: - ScriptError(const String& message); - ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false); + ScriptError(String message); + ScriptError(String message, DebugInfo di, bool incompleteExpr = false); ~ScriptError() throw() override; const char *what(void) const throw() final; @@ -121,7 +121,7 @@ inline std::string to_string(const ContextTraceErrorInfo& e) } String DiagnosticInformation(const std::exception& ex, bool verbose = true, StackTrace *stack = nullptr, ContextTrace *context = nullptr); -String DiagnosticInformation(boost::exception_ptr eptr, bool verbose = true); +String DiagnosticInformation(const boost::exception_ptr& eptr, bool verbose = true); class posix_error : virtual public std::exception, virtual public boost::exception { public: diff --git a/lib/base/function.cpp b/lib/base/function.cpp index 8fa90a3ca..13bf1d075 100644 --- a/lib/base/function.cpp +++ b/lib/base/function.cpp @@ -26,9 +26,9 @@ using namespace icinga; REGISTER_TYPE_WITH_PROTOTYPE(Function, Function::GetPrototype()); -Function::Function(const String& name, const Callback& function, const std::vector& args, +Function::Function(const String& name, Callback function, const std::vector& args, bool side_effect_free, bool deprecated) - : m_Callback(function) + : m_Callback(std::move(function)) { SetName(name, true); SetSideEffectFree(side_effect_free, true); diff --git a/lib/base/function.hpp b/lib/base/function.hpp index c9fa4d5d2..b607fea14 100644 --- a/lib/base/function.hpp +++ b/lib/base/function.hpp @@ -68,7 +68,7 @@ public: private: Callback m_Callback; - Function(const String& name, const Callback& function, const std::vector& args, + Function(const String& name, Callback function, const std::vector& args, bool side_effect_free, bool deprecated); }; diff --git a/lib/base/loader.hpp b/lib/base/loader.hpp index 5b07b187b..d54cada10 100644 --- a/lib/base/loader.hpp +++ b/lib/base/loader.hpp @@ -31,8 +31,8 @@ namespace icinga struct DeferredInitializer { public: - DeferredInitializer(const std::function& callback, int priority) - : m_Callback(callback), m_Priority(priority) + DeferredInitializer(std::function callback, int priority) + : m_Callback(std::move(callback)), m_Priority(priority) { } bool operator<(const DeferredInitializer& other) const diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp index 1a915b966..227ed3694 100644 --- a/lib/base/logger.cpp +++ b/lib/base/logger.cpp @@ -194,14 +194,14 @@ void Logger::ValidateSeverity(const String& value, const ValidationUtils& utils) } } -Log::Log(LogSeverity severity, const String& facility, const String& message) - : m_Severity(severity), m_Facility(facility) +Log::Log(LogSeverity severity, String facility, const String& message) + : m_Severity(severity), m_Facility(std::move(facility)) { m_Buffer << message; } -Log::Log(LogSeverity severity, const String& facility) - : m_Severity(severity), m_Facility(facility) +Log::Log(LogSeverity severity, String facility) + : m_Severity(severity), m_Facility(std::move(facility)) { } /** diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index 96dfd8efa..1ed79b197 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -111,8 +111,8 @@ public: Log(const Log& other) = delete; Log& operator=(const Log& rhs) = delete; - Log(LogSeverity severity, const String& facility, const String& message); - Log(LogSeverity severity, const String& facility); + Log(LogSeverity severity, String facility, const String& message); + Log(LogSeverity severity, String facility); ~Log(); diff --git a/lib/base/networkstream.cpp b/lib/base/networkstream.cpp index d9e66e8cd..4752b3fbf 100644 --- a/lib/base/networkstream.cpp +++ b/lib/base/networkstream.cpp @@ -21,8 +21,8 @@ using namespace icinga; -NetworkStream::NetworkStream(const Socket::Ptr& socket) - : m_Socket(socket), m_Eof(false) +NetworkStream::NetworkStream(Socket::Ptr socket) + : m_Socket(std::move(socket)), m_Eof(false) { } void NetworkStream::Close() diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp index 6b4f25bd6..edbd32f1c 100644 --- a/lib/base/networkstream.hpp +++ b/lib/base/networkstream.hpp @@ -37,7 +37,7 @@ class NetworkStream final : public Stream public: DECLARE_PTR_TYPEDEFS(NetworkStream); - NetworkStream(const Socket::Ptr& socket); + NetworkStream(Socket::Ptr socket); size_t Read(void *buffer, size_t count, bool allow_partial = false) override; void Write(const void *buffer, size_t count) override; diff --git a/lib/base/perfdatavalue.cpp b/lib/base/perfdatavalue.cpp index 17cb183bd..2c2829112 100644 --- a/lib/base/perfdatavalue.cpp +++ b/lib/base/perfdatavalue.cpp @@ -35,7 +35,7 @@ REGISTER_SCRIPTFUNCTION_NS(System, parse_performance_data, PerfdataValue::Parse, PerfdataValue::PerfdataValue() { } -PerfdataValue::PerfdataValue(String label, double value, bool counter, +PerfdataValue::PerfdataValue(const String& label, double value, bool counter, const String& unit, const Value& warn, const Value& crit, const Value& min, const Value& max) { diff --git a/lib/base/perfdatavalue.hpp b/lib/base/perfdatavalue.hpp index 35c88d106..c5128f8a7 100644 --- a/lib/base/perfdatavalue.hpp +++ b/lib/base/perfdatavalue.hpp @@ -38,7 +38,7 @@ public: PerfdataValue(); - PerfdataValue(String label, double value, bool counter = false, const String& unit = "", + PerfdataValue(const String& label, double value, bool counter = false, const String& unit = "", const Value& warn = Empty, const Value& crit = Empty, const Value& min = Empty, const Value& max = Empty); diff --git a/lib/base/primitivetype.cpp b/lib/base/primitivetype.cpp index 6be423d5e..9f1a6a3e8 100644 --- a/lib/base/primitivetype.cpp +++ b/lib/base/primitivetype.cpp @@ -22,8 +22,8 @@ using namespace icinga; -PrimitiveType::PrimitiveType(const String& name, const String& base, const ObjectFactory& factory) - : m_Name(name), m_Base(base), m_Factory(factory) +PrimitiveType::PrimitiveType(String name, String base, const ObjectFactory& factory) + : m_Name(std::move(name)), m_Base(std::move(base)), m_Factory(factory) { } String PrimitiveType::GetName() const diff --git a/lib/base/primitivetype.hpp b/lib/base/primitivetype.hpp index 562399dc7..45ae8411a 100644 --- a/lib/base/primitivetype.hpp +++ b/lib/base/primitivetype.hpp @@ -30,7 +30,7 @@ namespace icinga class PrimitiveType final : public Type { public: - PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory()); + PrimitiveType(String name, String base, const ObjectFactory& factory = ObjectFactory()); String GetName() const override; Type::Ptr GetBaseType() const override; diff --git a/lib/base/process.cpp b/lib/base/process.cpp index fef953dde..c9cced610 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -65,8 +65,8 @@ static pid_t l_ProcessControlPID; static boost::once_flag l_ProcessOnceFlag = BOOST_ONCE_INIT; static boost::once_flag l_SpawnHelperOnceFlag = BOOST_ONCE_INIT; -Process::Process(const Process::Arguments& arguments, const Dictionary::Ptr& extraEnvironment) - : m_Arguments(arguments), m_ExtraEnvironment(extraEnvironment), m_Timeout(600), m_AdjustPriority(false) +Process::Process(Process::Arguments arguments, Dictionary::Ptr extraEnvironment) + : m_Arguments(std::move(arguments)), m_ExtraEnvironment(std::move(extraEnvironment)), m_Timeout(600), m_AdjustPriority(false) #ifdef _WIN32 , m_ReadPending(false), m_ReadFailed(false), m_Overlapped() #endif /* _WIN32 */ diff --git a/lib/base/process.hpp b/lib/base/process.hpp index 6e62f1df7..b5d9db4e0 100644 --- a/lib/base/process.hpp +++ b/lib/base/process.hpp @@ -66,7 +66,7 @@ public: static const std::deque::size_type MaxTasksPerThread = 512; - Process(const Arguments& arguments, const Dictionary::Ptr& extraEnvironment = nullptr); + Process(Arguments arguments, Dictionary::Ptr extraEnvironment = nullptr); ~Process() override; void SetTimeout(double timeout); diff --git a/lib/base/scriptframe.cpp b/lib/base/scriptframe.cpp index 9ff9f0462..65597a783 100644 --- a/lib/base/scriptframe.cpp +++ b/lib/base/scriptframe.cpp @@ -46,8 +46,8 @@ ScriptFrame::ScriptFrame(bool allocLocals) InitializeFrame(); } -ScriptFrame::ScriptFrame(bool allocLocals, const Value& self) - : Locals(allocLocals ? new Dictionary() : nullptr), Self(self), Sandboxed(false), Depth(0) +ScriptFrame::ScriptFrame(bool allocLocals, Value self) + : Locals(allocLocals ? new Dictionary() : nullptr), Self(std::move(self)), Sandboxed(false), Depth(0) { InitializeFrame(); } diff --git a/lib/base/scriptframe.hpp b/lib/base/scriptframe.hpp index 54cb188c3..16a6592f5 100644 --- a/lib/base/scriptframe.hpp +++ b/lib/base/scriptframe.hpp @@ -37,7 +37,7 @@ struct ScriptFrame int Depth; ScriptFrame(bool allocLocals); - ScriptFrame(bool allocLocals, const Value& self); + ScriptFrame(bool allocLocals, Value self); ~ScriptFrame(); void IncreaseStackDepth(); diff --git a/lib/base/string.cpp b/lib/base/string.cpp index 675f97a60..998a73ceb 100644 --- a/lib/base/string.cpp +++ b/lib/base/string.cpp @@ -39,11 +39,7 @@ String::String(const char *data) : m_Data(data) { } -String::String(const std::string& data) - : m_Data(data) -{ } - -String::String(std::string&& data) +String::String(std::string data) : m_Data(std::move(data)) { } diff --git a/lib/base/string.hpp b/lib/base/string.hpp index b60eb2c98..d8a8d7626 100644 --- a/lib/base/string.hpp +++ b/lib/base/string.hpp @@ -60,8 +60,7 @@ public: String(); String(const char *data); - String(const std::string& data); - String(std::string&& data); + String(std::string data); String(String::SizeType n, char c); String(const String& other); String(String&& other); diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp index c46944847..9225fd6d2 100644 --- a/lib/cli/consolecommand.cpp +++ b/lib/cli/consolecommand.cpp @@ -502,7 +502,7 @@ incomplete: } void ConsoleCommand::ExecuteScriptCompletionHandler(boost::mutex& mutex, boost::condition_variable& cv, - bool& ready, boost::exception_ptr eptr, const Value& result, Value& resultOut, boost::exception_ptr& eptrOut) + bool& ready, const boost::exception_ptr& eptr, const Value& result, Value& resultOut, boost::exception_ptr& eptrOut) { if (eptr) { try { @@ -526,7 +526,7 @@ void ConsoleCommand::ExecuteScriptCompletionHandler(boost::mutex& mutex, boost:: } void ConsoleCommand::AutocompleteScriptCompletionHandler(boost::mutex& mutex, boost::condition_variable& cv, - bool& ready, boost::exception_ptr eptr, const Array::Ptr& result, Array::Ptr& resultOut) + bool& ready, const boost::exception_ptr& eptr, const Array::Ptr& result, Array::Ptr& resultOut) { if (eptr) { try { diff --git a/lib/cli/consolecommand.hpp b/lib/cli/consolecommand.hpp index 6180c58a9..9369080c4 100644 --- a/lib/cli/consolecommand.hpp +++ b/lib/cli/consolecommand.hpp @@ -55,10 +55,10 @@ private: mutable boost::condition_variable m_CV; static void ExecuteScriptCompletionHandler(boost::mutex& mutex, boost::condition_variable& cv, - bool& ready, boost::exception_ptr eptr, const Value& result, Value& resultOut, + bool& ready, const boost::exception_ptr& eptr, const Value& result, Value& resultOut, boost::exception_ptr& eptrOut); static void AutocompleteScriptCompletionHandler(boost::mutex& mutex, boost::condition_variable& cv, - bool& ready, boost::exception_ptr eptr, const Array::Ptr& result, Array::Ptr& resultOut); + bool& ready, const boost::exception_ptr& eptr, const Array::Ptr& result, Array::Ptr& resultOut); #ifdef HAVE_EDITLINE static char *ConsoleCompleteHelper(const char *word, int state); diff --git a/lib/cli/troubleshootcommand.cpp b/lib/cli/troubleshootcommand.cpp index 2649058c8..e86454225 100644 --- a/lib/cli/troubleshootcommand.cpp +++ b/lib/cli/troubleshootcommand.cpp @@ -324,9 +324,9 @@ bool TroubleshootCommand::CheckFeatures(InfoLog& log) return false; } - for (const String feature : disabled_features) + for (const String& feature : disabled_features) features->Set(feature, false); - for (const String feature : enabled_features) + for (const String& feature : enabled_features) features->Set(feature, true); InfoLogLine(log) diff --git a/lib/config/activationcontext.cpp b/lib/config/activationcontext.cpp index 843dec092..c22f41caf 100644 --- a/lib/config/activationcontext.cpp +++ b/lib/config/activationcontext.cpp @@ -57,8 +57,8 @@ ActivationContext::Ptr ActivationContext::GetCurrentContext() return astack.top(); } -ActivationScope::ActivationScope(const ActivationContext::Ptr& context) - : m_Context(context) +ActivationScope::ActivationScope(ActivationContext::Ptr context) + : m_Context(std::move(context)) { if (!m_Context) m_Context = new ActivationContext(); diff --git a/lib/config/activationcontext.hpp b/lib/config/activationcontext.hpp index 4040a8d3d..c5a275631 100644 --- a/lib/config/activationcontext.hpp +++ b/lib/config/activationcontext.hpp @@ -49,7 +49,7 @@ private: class ActivationScope { public: - ActivationScope(const ActivationContext::Ptr& context = nullptr); + ActivationScope(ActivationContext::Ptr context = nullptr); ~ActivationScope(); ActivationContext::Ptr GetContext() const; diff --git a/lib/config/applyrule.cpp b/lib/config/applyrule.cpp index 4ad291330..c8f012e23 100644 --- a/lib/config/applyrule.cpp +++ b/lib/config/applyrule.cpp @@ -26,11 +26,11 @@ using namespace icinga; ApplyRule::RuleMap ApplyRule::m_Rules; ApplyRule::TypeMap ApplyRule::m_Types; -ApplyRule::ApplyRule(const String& targetType, const String& name, const std::shared_ptr& expression, - const std::shared_ptr& filter, const String& package, const String& fkvar, const String& fvvar, const std::shared_ptr& fterm, - bool ignoreOnError, const DebugInfo& di, const Dictionary::Ptr& scope) - : m_TargetType(targetType), m_Name(name), m_Expression(expression), m_Filter(filter), m_Package(package), m_FKVar(fkvar), - m_FVVar(fvvar), m_FTerm(fterm), m_IgnoreOnError(ignoreOnError), m_DebugInfo(di), m_Scope(scope), m_HasMatches(false) +ApplyRule::ApplyRule(String targetType, String name, std::shared_ptr expression, + std::shared_ptr filter, String package, String fkvar, String fvvar, std::shared_ptr fterm, + bool ignoreOnError, DebugInfo di, Dictionary::Ptr scope) + : m_TargetType(std::move(targetType)), m_Name(std::move(name)), m_Expression(std::move(expression)), m_Filter(std::move(filter)), m_Package(std::move(package)), m_FKVar(std::move(fkvar)), + m_FVVar(std::move(fvvar)), m_FTerm(std::move(fterm)), m_IgnoreOnError(ignoreOnError), m_DebugInfo(std::move(di)), m_Scope(std::move(scope)), m_HasMatches(false) { } String ApplyRule::GetTargetType() const diff --git a/lib/config/applyrule.hpp b/lib/config/applyrule.hpp index 1d06598c7..91623df75 100644 --- a/lib/config/applyrule.hpp +++ b/lib/config/applyrule.hpp @@ -81,9 +81,9 @@ private: static TypeMap m_Types; static RuleMap m_Rules; - ApplyRule(const String& targetType, const String& name, const std::shared_ptr& expression, - const std::shared_ptr& filter, const String& package, const String& fkvar, const String& fvvar, const std::shared_ptr& fterm, - bool ignoreOnError, const DebugInfo& di, const Dictionary::Ptr& scope); + ApplyRule(String targetType, String name, std::shared_ptr expression, + std::shared_ptr filter, String package, String fkvar, String fvvar, std::shared_ptr fterm, + bool ignoreOnError, DebugInfo di, Dictionary::Ptr scope); }; } diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp index 02730bc32..f8b754bb9 100644 --- a/lib/config/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -40,10 +40,10 @@ std::map > ConfigCompiler::m_ZoneDirs; * @param input Input stream for the configuration file. * @param zone The zone. */ -ConfigCompiler::ConfigCompiler(const String& path, std::istream *input, - const String& zone, const String& package) - : m_Path(path), m_Input(input), m_Zone(zone), m_Package(package), - m_Eof(false), m_OpenBraces(0) +ConfigCompiler::ConfigCompiler(String path, std::istream *input, + String zone, String package) + : m_Path(std::move(path)), m_Input(input), m_Zone(std::move(zone)), + m_Package(std::move(package)), m_Eof(false), m_OpenBraces(0) { InitializeScanner(); } @@ -339,7 +339,8 @@ bool ConfigCompiler::HasZoneConfigAuthority(const String& zoneName) if (!empty) { std::vector paths; - for (const ZoneFragment& zf : zoneDirs) { + paths.reserve(zoneDirs.size()); +for (const ZoneFragment& zf : zoneDirs) { paths.push_back(zf.Path); } diff --git a/lib/config/configcompiler.hpp b/lib/config/configcompiler.hpp index 3b7b1ae97..d4a03681e 100644 --- a/lib/config/configcompiler.hpp +++ b/lib/config/configcompiler.hpp @@ -86,8 +86,8 @@ struct ZoneFragment class ConfigCompiler { public: - explicit ConfigCompiler(const String& path, std::istream *input, - const String& zone = String(), const String& package = String()); + explicit ConfigCompiler(String path, std::istream *input, + String zone = String(), String package = String()); virtual ~ConfigCompiler(); std::unique_ptr Compile(); diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 20508c94c..6b30bc094 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -59,16 +59,16 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, run_with_activation_context, &ConfigItem::R * @param exprl Expression list for the item. * @param debuginfo Debug information. */ -ConfigItem::ConfigItem(const Type::Ptr& type, const String& name, - bool abstract, const std::shared_ptr& exprl, - const std::shared_ptr& filter, bool defaultTmpl, bool ignoreOnError, - const DebugInfo& debuginfo, const Dictionary::Ptr& scope, - const String& zone, const String& package) - : m_Type(type), m_Name(name), m_Abstract(abstract), - m_Expression(exprl), m_Filter(filter), +ConfigItem::ConfigItem(Type::Ptr type, String name, + bool abstract, std::shared_ptr exprl, + std::shared_ptr filter, bool defaultTmpl, bool ignoreOnError, + DebugInfo debuginfo, Dictionary::Ptr scope, + String zone, String package) + : m_Type(std::move(type)), m_Name(std::move(name)), m_Abstract(abstract), + m_Expression(std::move(exprl)), m_Filter(std::move(filter)), m_DefaultTmpl(defaultTmpl), m_IgnoreOnError(ignoreOnError), - m_DebugInfo(debuginfo), m_Scope(scope), m_Zone(zone), - m_Package(package) + m_DebugInfo(std::move(debuginfo)), m_Scope(std::move(scope)), m_Zone(std::move(zone)), + m_Package(std::move(package)) { } diff --git a/lib/config/configitem.hpp b/lib/config/configitem.hpp index 30d28c572..f560fa64d 100644 --- a/lib/config/configitem.hpp +++ b/lib/config/configitem.hpp @@ -40,12 +40,12 @@ class ConfigItem final : public Object { public: DECLARE_PTR_TYPEDEFS(ConfigItem); - ConfigItem(const Type::Ptr& type, const String& name, bool abstract, - const std::shared_ptr& exprl, - const std::shared_ptr& filter, - bool defaultTmpl, bool ignoreOnError, const DebugInfo& debuginfo, - const Dictionary::Ptr& scope, const String& zone, - const String& package); + ConfigItem(Type::Ptr type, String name, bool abstract, + std::shared_ptr exprl, + std::shared_ptr filter, + bool defaultTmpl, bool ignoreOnError, DebugInfo debuginfo, + Dictionary::Ptr scope, String zone, + String package); Type::Ptr GetType() const; String GetName() const; diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp index 9692655a2..bb7fe2248 100644 --- a/lib/config/expression.cpp +++ b/lib/config/expression.cpp @@ -101,8 +101,8 @@ void DictExpression::MakeInline() m_Inline = true; } -LiteralExpression::LiteralExpression(const Value& value) - : m_Value(value) +LiteralExpression::LiteralExpression(Value value) + : m_Value(std::move(value)) { } ExpressionResult LiteralExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index 7dc0876a3..8c2882cdd 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -36,8 +36,8 @@ namespace icinga struct DebugHint { public: - DebugHint(const Dictionary::Ptr& hints = nullptr) - : m_Hints(hints) + DebugHint(Dictionary::Ptr hints = nullptr) + : m_Hints(std::move(hints)) { } DebugHint(Dictionary::Ptr&& hints) @@ -154,8 +154,8 @@ struct ExpressionResult { public: template - ExpressionResult(const T& value, ExpressionResultCode code = ResultOK) - : m_Value(value), m_Code(code) + ExpressionResult(T value, ExpressionResultCode code = ResultOK) + : m_Value(std::move(value)), m_Code(code) { } operator const Value&() const @@ -220,8 +220,8 @@ std::unique_ptr MakeIndexer(ScopeSpecifier scopeSpec, const String& class OwnedExpression final : public Expression { public: - OwnedExpression(const std::shared_ptr& expression) - : m_Expression(expression) + OwnedExpression(std::shared_ptr expression) + : m_Expression(std::move(expression)) { } protected: @@ -242,7 +242,7 @@ private: class LiteralExpression final : public Expression { public: - LiteralExpression(const Value& value = Value()); + LiteralExpression(Value value = Value()); const Value& GetValue() const { @@ -269,8 +269,8 @@ inline std::unique_ptr MakeLiteral(const Value& literal = Val class DebuggableExpression : public Expression { public: - DebuggableExpression(const DebugInfo& debugInfo = DebugInfo()) - : m_DebugInfo(debugInfo) + DebuggableExpression(DebugInfo debugInfo = DebugInfo()) + : m_DebugInfo(std::move(debugInfo)) { } protected: @@ -305,8 +305,8 @@ protected: class VariableExpression final : public DebuggableExpression { public: - VariableExpression(const String& variable, const DebugInfo& debugInfo = DebugInfo()) - : DebuggableExpression(debugInfo), m_Variable(variable) + VariableExpression(String variable, const DebugInfo& debugInfo = DebugInfo()) + : DebuggableExpression(debugInfo), m_Variable(std::move(variable)) { } String GetVariable() const @@ -768,9 +768,9 @@ protected: class FunctionExpression final : public DebuggableExpression { public: - FunctionExpression(const String& name, const std::vector& args, + FunctionExpression(String name, std::vector args, std::map >&& closedVars, std::unique_ptr expression, const DebugInfo& debugInfo = DebugInfo()) - : DebuggableExpression(debugInfo), m_Name(name), m_Args(args), m_ClosedVars(std::move(closedVars)), m_Expression(std::move(expression)) + : DebuggableExpression(debugInfo), m_Name(std::move(name)), m_Args(std::move(args)), m_ClosedVars(std::move(closedVars)), m_Expression(std::move(expression)) { } protected: @@ -786,12 +786,12 @@ private: class ApplyExpression final : public DebuggableExpression { public: - ApplyExpression(const String& type, const String& target, std::unique_ptr name, - std::unique_ptr filter, const String& package, const String& fkvar, const String& fvvar, + ApplyExpression(String type, String target, std::unique_ptr name, + std::unique_ptr filter, String package, String fkvar, String fvvar, std::unique_ptr fterm, std::map >&& closedVars, bool ignoreOnError, std::unique_ptr expression, const DebugInfo& debugInfo = DebugInfo()) - : DebuggableExpression(debugInfo), m_Type(type), m_Target(target), - m_Name(std::move(name)), m_Filter(std::move(filter)), m_Package(package), m_FKVar(fkvar), m_FVVar(fvvar), + : DebuggableExpression(debugInfo), m_Type(std::move(type)), m_Target(std::move(target)), + m_Name(std::move(name)), m_Filter(std::move(filter)), m_Package(std::move(package)), m_FKVar(std::move(fkvar)), m_FVVar(std::move(fvvar)), m_FTerm(std::move(fterm)), m_IgnoreOnError(ignoreOnError), m_ClosedVars(std::move(closedVars)), m_Expression(std::move(expression)) { } @@ -817,10 +817,10 @@ class ObjectExpression final : public DebuggableExpression { public: ObjectExpression(bool abstract, std::unique_ptr type, std::unique_ptr name, std::unique_ptr filter, - const String& zone, const String& package, std::map >&& closedVars, + String zone, String package, std::map >&& closedVars, bool defaultTmpl, bool ignoreOnError, std::unique_ptr expression, const DebugInfo& debugInfo = DebugInfo()) : DebuggableExpression(debugInfo), m_Abstract(abstract), m_Type(std::move(type)), - m_Name(std::move(name)), m_Filter(std::move(filter)), m_Zone(zone), m_Package(package), m_DefaultTmpl(defaultTmpl), + m_Name(std::move(name)), m_Filter(std::move(filter)), m_Zone(std::move(zone)), m_Package(std::move(package)), m_DefaultTmpl(defaultTmpl), m_IgnoreOnError(ignoreOnError), m_ClosedVars(std::move(closedVars)), m_Expression(std::move(expression)) { } @@ -843,8 +843,8 @@ private: class ForExpression final : public DebuggableExpression { public: - ForExpression(const String& fkvar, const String& fvvar, std::unique_ptr value, std::unique_ptr expression, const DebugInfo& debugInfo = DebugInfo()) - : DebuggableExpression(debugInfo), m_FKVar(fkvar), m_FVVar(fvvar), m_Value(std::move(value)), m_Expression(std::move(expression)) + ForExpression(String fkvar, String fvvar, std::unique_ptr value, std::unique_ptr expression, const DebugInfo& debugInfo = DebugInfo()) + : DebuggableExpression(debugInfo), m_FKVar(std::move(fkvar)), m_FVVar(std::move(fvvar)), m_Value(std::move(value)), m_Expression(std::move(expression)) { } protected: @@ -878,10 +878,10 @@ enum IncludeType class IncludeExpression final : public DebuggableExpression { public: - IncludeExpression(const String& relativeBase, std::unique_ptr path, std::unique_ptr pattern, std::unique_ptr name, - IncludeType type, bool searchIncludes, const String& zone, const String& package, const DebugInfo& debugInfo = DebugInfo()) - : DebuggableExpression(debugInfo), m_RelativeBase(relativeBase), m_Path(std::move(path)), m_Pattern(std::move(pattern)), - m_Name(std::move(name)), m_Type(type), m_SearchIncludes(searchIncludes), m_Zone(zone), m_Package(package) + IncludeExpression(String relativeBase, std::unique_ptr path, std::unique_ptr pattern, std::unique_ptr name, + IncludeType type, bool searchIncludes, String zone, String package, const DebugInfo& debugInfo = DebugInfo()) + : DebuggableExpression(debugInfo), m_RelativeBase(std::move(relativeBase)), m_Path(std::move(path)), m_Pattern(std::move(pattern)), + m_Name(std::move(name)), m_Type(type), m_SearchIncludes(searchIncludes), m_Zone(std::move(zone)), m_Package(std::move(package)) { } protected: diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp index abe1ddfed..ab2ba3e2b 100644 --- a/lib/db_ido/dbevents.cpp +++ b/lib/db_ido/dbevents.cpp @@ -1247,7 +1247,7 @@ void DbEvents::AddEnableFlappingChangedLogHistory(const Checkable::Ptr& checkabl AddLogHistory(checkable, msgbuf.str(), LogEntryTypeInfoMessage); } -void DbEvents::AddLogHistory(const Checkable::Ptr& checkable, String buffer, LogEntryType type) +void DbEvents::AddLogHistory(const Checkable::Ptr& checkable, const String& buffer, LogEntryType type) { Log(LogDebug, "DbEvents") << "add log entry history for '" << checkable->GetName() << "'"; diff --git a/lib/db_ido/dbevents.hpp b/lib/db_ido/dbevents.hpp index b651dd600..db52ccf1b 100644 --- a/lib/db_ido/dbevents.hpp +++ b/lib/db_ido/dbevents.hpp @@ -66,7 +66,7 @@ public: static void AddDowntimes(const Checkable::Ptr& checkable); static void RemoveDowntimes(const Checkable::Ptr& checkable); - static void AddLogHistory(const Checkable::Ptr& checkable, String buffer, LogEntryType type); + static void AddLogHistory(const Checkable::Ptr& checkable, const String& buffer, LogEntryType type); /* Status */ static void NextCheckUpdatedHandler(const Checkable::Ptr& checkable); diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp index d781756c4..7a7fa92ae 100644 --- a/lib/db_ido/dbobject.cpp +++ b/lib/db_ido/dbobject.cpp @@ -45,8 +45,8 @@ boost::signals2::signal&)> DbObject::OnMultiple INITIALIZE_ONCE(&DbObject::StaticInitialize); -DbObject::DbObject(const intrusive_ptr& type, const String& name1, const String& name2) - : m_Name1(name1), m_Name2(name2), m_Type(type), m_LastConfigUpdate(0), m_LastStatusUpdate(0) +DbObject::DbObject(intrusive_ptr type, String name1, String name2) + : m_Name1(std::move(name1)), m_Name2(std::move(name2)), m_Type(std::move(type)), m_LastConfigUpdate(0), m_LastStatusUpdate(0) { } void DbObject::StaticInitialize() diff --git a/lib/db_ido/dbobject.hpp b/lib/db_ido/dbobject.hpp index 16f23d49c..a90170d74 100644 --- a/lib/db_ido/dbobject.hpp +++ b/lib/db_ido/dbobject.hpp @@ -93,7 +93,7 @@ public: virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const; protected: - DbObject(const intrusive_ptr& type, const String& name1, const String& name2); + DbObject(intrusive_ptr type, String name1, String name2); virtual void OnConfigUpdateHeavy(); virtual void OnConfigUpdateLight(); diff --git a/lib/db_ido/dbtype.cpp b/lib/db_ido/dbtype.cpp index 1dc1e3301..65b56896b 100644 --- a/lib/db_ido/dbtype.cpp +++ b/lib/db_ido/dbtype.cpp @@ -25,8 +25,8 @@ using namespace icinga; -DbType::DbType(const String& name, const String& table, long tid, const String& idcolumn, const DbType::ObjectFactory& factory) - : m_Name(name), m_Table(table), m_TypeID(tid), m_IDColumn(idcolumn), m_ObjectFactory(factory) +DbType::DbType(String name, String table, long tid, String idcolumn, DbType::ObjectFactory factory) + : m_Name(std::move(name)), m_Table(std::move(table)), m_TypeID(tid), m_IDColumn(std::move(idcolumn)), m_ObjectFactory(std::move(factory)) { } String DbType::GetName() const diff --git a/lib/db_ido/dbtype.hpp b/lib/db_ido/dbtype.hpp index cc1e9b3d2..ad6f3f957 100644 --- a/lib/db_ido/dbtype.hpp +++ b/lib/db_ido/dbtype.hpp @@ -45,7 +45,7 @@ public: typedef std::map TypeMap; typedef std::map, intrusive_ptr > ObjectMap; - DbType(const String& name, const String& table, long tid, const String& idcolumn, const ObjectFactory& factory); + DbType(String name, String table, long tid, String idcolumn, ObjectFactory factory); String GetName() const; String GetTable() const; diff --git a/lib/db_ido/dbvalue.cpp b/lib/db_ido/dbvalue.cpp index 2c4a2750f..a626e59fe 100644 --- a/lib/db_ido/dbvalue.cpp +++ b/lib/db_ido/dbvalue.cpp @@ -21,8 +21,8 @@ using namespace icinga; -DbValue::DbValue(DbValueType type, const Value& value) - : m_Type(type), m_Value(value) +DbValue::DbValue(DbValueType type, Value value) + : m_Type(type), m_Value(std::move(value)) { } Value DbValue::FromTimestamp(const Value& ts) diff --git a/lib/db_ido/dbvalue.hpp b/lib/db_ido/dbvalue.hpp index aad636ac6..fcb985409 100644 --- a/lib/db_ido/dbvalue.hpp +++ b/lib/db_ido/dbvalue.hpp @@ -44,7 +44,7 @@ struct DbValue final : public Object public: DECLARE_PTR_TYPEDEFS(DbValue); - DbValue(DbValueType type, const Value& value); + DbValue(DbValueType type, Value value); static Value FromTimestamp(const Value& ts); static Value FromTimestampNow(); diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index 481c08d04..af337e660 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -31,6 +31,7 @@ #include "base/exception.hpp" #include "base/statsfunction.hpp" #include +#include using namespace icinga; @@ -132,7 +133,7 @@ void IdoMysqlConnection::ExceptionHandler(boost::exception_ptr exp) Log(LogCritical, "IdoMysqlConnection", "Exception during database operation: Verify that your database is operational!"); Log(LogDebug, "IdoMysqlConnection") - << "Exception during database operation: " << DiagnosticInformation(exp); + << "Exception during database operation: " << DiagnosticInformation(std::move(exp)); if (GetConnected()) { m_Mysql->close(&m_Connection); diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index b89bf4d20..2a8962853 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -32,6 +32,7 @@ #include "base/context.hpp" #include "base/statsfunction.hpp" #include +#include using namespace icinga; @@ -131,7 +132,7 @@ void IdoPgsqlConnection::ExceptionHandler(boost::exception_ptr exp) Log(LogWarning, "IdoPgsqlConnection", "Exception during database operation: Verify that your database is operational!"); Log(LogDebug, "IdoPgsqlConnection") - << "Exception during database operation: " << DiagnosticInformation(exp); + << "Exception during database operation: " << DiagnosticInformation(std::move(exp)); if (GetConnected()) { m_Pgsql->finish(m_Connection); diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp index 8e5388ac1..3139e0d52 100644 --- a/lib/icinga/compatutility.cpp +++ b/lib/icinga/compatutility.cpp @@ -55,7 +55,7 @@ String CompatUtility::GetCommandLine(const Command::Ptr& command) return result; } -String CompatUtility::GetCommandNamePrefix(const Command::Ptr command) +String CompatUtility::GetCommandNamePrefix(const Command::Ptr& command) { if (!command) return Empty; @@ -71,7 +71,7 @@ String CompatUtility::GetCommandNamePrefix(const Command::Ptr command) return prefix; } -String CompatUtility::GetCommandName(const Command::Ptr command) +String CompatUtility::GetCommandName(const Command::Ptr& command) { if (!command) return Empty; diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp index a0a96a0ce..5cfcbe7e3 100644 --- a/lib/icinga/compatutility.hpp +++ b/lib/icinga/compatutility.hpp @@ -41,7 +41,7 @@ class CompatUtility public: /* command */ static String GetCommandLine(const Command::Ptr& command); - static String GetCommandName(const Command::Ptr command); + static String GetCommandName(const Command::Ptr& command); /* host */ static int GetHostCurrentState(const Host::Ptr& host); @@ -122,7 +122,7 @@ public: private: CompatUtility(); - static String GetCommandNamePrefix(const Command::Ptr command); + static String GetCommandNamePrefix(const Command::Ptr& command); }; } diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp index 5b8b322f5..2b27eaaa8 100644 --- a/lib/icinga/scheduleddowntime.hpp +++ b/lib/icinga/scheduleddowntime.hpp @@ -23,7 +23,6 @@ #include "icinga/i2-icinga.hpp" #include "icinga/scheduleddowntime.thpp" #include "icinga/checkable.hpp" -#include namespace icinga { diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp index dd7c54e1f..39952a2b1 100644 --- a/lib/icinga/service.hpp +++ b/lib/icinga/service.hpp @@ -24,7 +24,6 @@ #include "icinga/service.thpp" #include "icinga/macroresolver.hpp" #include "icinga/host.hpp" -#include #include using std::tie; diff --git a/lib/livestatus/attributefilter.cpp b/lib/livestatus/attributefilter.cpp index 58050d014..35ed40cf7 100644 --- a/lib/livestatus/attributefilter.cpp +++ b/lib/livestatus/attributefilter.cpp @@ -27,8 +27,8 @@ using namespace icinga; -AttributeFilter::AttributeFilter(const String& column, const String& op, const String& operand) - : m_Column(column), m_Operator(op), m_Operand(operand) +AttributeFilter::AttributeFilter(String column, String op, String operand) + : m_Column(std::move(column)), m_Operator(std::move(op)), m_Operand(std::move(operand)) { } bool AttributeFilter::Apply(const Table::Ptr& table, const Value& row) diff --git a/lib/livestatus/attributefilter.hpp b/lib/livestatus/attributefilter.hpp index c3a607192..f8220eaad 100644 --- a/lib/livestatus/attributefilter.hpp +++ b/lib/livestatus/attributefilter.hpp @@ -35,7 +35,7 @@ class AttributeFilter final : public Filter public: DECLARE_PTR_TYPEDEFS(AttributeFilter); - AttributeFilter(const String& column, const String& op, const String& operand); + AttributeFilter(String column, String op, String operand); bool Apply(const Table::Ptr& table, const Value& row) override; diff --git a/lib/livestatus/avgaggregator.cpp b/lib/livestatus/avgaggregator.cpp index 0c9af05b6..592aadb1c 100644 --- a/lib/livestatus/avgaggregator.cpp +++ b/lib/livestatus/avgaggregator.cpp @@ -21,8 +21,8 @@ using namespace icinga; -AvgAggregator::AvgAggregator(const String& attr) - : m_AvgAttr(attr) +AvgAggregator::AvgAggregator(String attr) + : m_AvgAttr(std::move(attr)) { } AvgAggregatorState *AvgAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp index 592ac50d4..183ddb059 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -47,7 +47,7 @@ class AvgAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(AvgAggregator); - AvgAggregator(const String& attr); + AvgAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/column.cpp b/lib/livestatus/column.cpp index c4670f398..8cdd4eacf 100644 --- a/lib/livestatus/column.cpp +++ b/lib/livestatus/column.cpp @@ -21,8 +21,8 @@ using namespace icinga; -Column::Column(const ValueAccessor& valueAccessor, const ObjectAccessor& objectAccessor) - : m_ValueAccessor(valueAccessor), m_ObjectAccessor(objectAccessor) +Column::Column(ValueAccessor valueAccessor, ObjectAccessor objectAccessor) + : m_ValueAccessor(std::move(valueAccessor)), m_ObjectAccessor(std::move(objectAccessor)) { } Value Column::ExtractValue(const Value& urow, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject) const diff --git a/lib/livestatus/column.hpp b/lib/livestatus/column.hpp index 7a0ad1c69..4cc132ab7 100644 --- a/lib/livestatus/column.hpp +++ b/lib/livestatus/column.hpp @@ -40,7 +40,7 @@ public: typedef std::function ValueAccessor; typedef std::function ObjectAccessor; - Column(const ValueAccessor& valueAccessor, const ObjectAccessor& objectAccessor); + Column(ValueAccessor valueAccessor, ObjectAccessor objectAccessor); Value ExtractValue(const Value& urow, LivestatusGroupByType groupByType = LivestatusGroupByNone, const Object::Ptr& groupByObject = Empty) const; diff --git a/lib/livestatus/filter.hpp b/lib/livestatus/filter.hpp index 71270e741..2febc8db3 100644 --- a/lib/livestatus/filter.hpp +++ b/lib/livestatus/filter.hpp @@ -37,7 +37,7 @@ public: virtual bool Apply(const Table::Ptr& table, const Value& row) = 0; protected: - Filter(); + Filter() = default; }; } diff --git a/lib/livestatus/invavgaggregator.cpp b/lib/livestatus/invavgaggregator.cpp index 5e739a667..82ed69f70 100644 --- a/lib/livestatus/invavgaggregator.cpp +++ b/lib/livestatus/invavgaggregator.cpp @@ -21,8 +21,8 @@ using namespace icinga; -InvAvgAggregator::InvAvgAggregator(const String& attr) - : m_InvAvgAttr(attr) +InvAvgAggregator::InvAvgAggregator(String attr) + : m_InvAvgAttr(std::move(attr)) { } InvAvgAggregatorState *InvAvgAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp index 3bfb389d1..05a255da8 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -47,7 +47,7 @@ class InvAvgAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(InvAvgAggregator); - InvAvgAggregator(const String& attr); + InvAvgAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/invsumaggregator.cpp b/lib/livestatus/invsumaggregator.cpp index a1b3f25d3..dc6eac69c 100644 --- a/lib/livestatus/invsumaggregator.cpp +++ b/lib/livestatus/invsumaggregator.cpp @@ -21,8 +21,8 @@ using namespace icinga; -InvSumAggregator::InvSumAggregator(const String& attr) - : m_InvSumAttr(attr) +InvSumAggregator::InvSumAggregator(String attr) + : m_InvSumAttr(std::move(attr)) { } InvSumAggregatorState *InvSumAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index 43804ac28..65b8d026d 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -46,7 +46,7 @@ class InvSumAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(InvSumAggregator); - InvSumAggregator(const String& attr); + InvSumAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp index 62b6016c4..ab33f8638 100644 --- a/lib/livestatus/livestatusquery.cpp +++ b/lib/livestatus/livestatusquery.cpp @@ -534,7 +534,7 @@ void LivestatusQuery::ExecuteGetHelper(const Stream::Ptr& stream) int index = 0; - for (const Aggregator::Ptr aggregator : m_Aggregators) { + for (const Aggregator::Ptr& aggregator : m_Aggregators) { aggregator->Apply(table, object.Row, &stats[index]); index++; } diff --git a/lib/livestatus/maxaggregator.cpp b/lib/livestatus/maxaggregator.cpp index 69c83103b..a2265430b 100644 --- a/lib/livestatus/maxaggregator.cpp +++ b/lib/livestatus/maxaggregator.cpp @@ -21,8 +21,8 @@ using namespace icinga; -MaxAggregator::MaxAggregator(const String& attr) - : m_MaxAttr(attr) +MaxAggregator::MaxAggregator(String attr) + : m_MaxAttr(std::move(attr)) { } MaxAggregatorState *MaxAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp index 9515c3d71..fd102d1f2 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -46,7 +46,7 @@ class MaxAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(MaxAggregator); - MaxAggregator(const String& attr); + MaxAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/minaggregator.cpp b/lib/livestatus/minaggregator.cpp index 5060ab071..bf4390230 100644 --- a/lib/livestatus/minaggregator.cpp +++ b/lib/livestatus/minaggregator.cpp @@ -21,8 +21,8 @@ using namespace icinga; -MinAggregator::MinAggregator(const String& attr) - : m_MinAttr(attr) +MinAggregator::MinAggregator(String attr) + : m_MinAttr(std::move(attr)) { } MinAggregatorState *MinAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index a703474f1..b9560937d 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -47,7 +47,7 @@ class MinAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(MinAggregator); - MinAggregator(const String& attr); + MinAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/negatefilter.cpp b/lib/livestatus/negatefilter.cpp index 82d971ba0..8a8f341c6 100644 --- a/lib/livestatus/negatefilter.cpp +++ b/lib/livestatus/negatefilter.cpp @@ -21,8 +21,8 @@ using namespace icinga; -NegateFilter::NegateFilter(const Filter::Ptr& inner) - : m_Inner(inner) +NegateFilter::NegateFilter(Filter::Ptr inner) + : m_Inner(std::move(inner)) { } bool NegateFilter::Apply(const Table::Ptr& table, const Value& row) diff --git a/lib/livestatus/negatefilter.hpp b/lib/livestatus/negatefilter.hpp index f0744a11d..4a88f35e4 100644 --- a/lib/livestatus/negatefilter.hpp +++ b/lib/livestatus/negatefilter.hpp @@ -35,7 +35,7 @@ class NegateFilter final : public Filter public: DECLARE_PTR_TYPEDEFS(NegateFilter); - NegateFilter(const Filter::Ptr& inner); + NegateFilter(Filter::Ptr inner); bool Apply(const Table::Ptr& table, const Value& row) override; diff --git a/lib/livestatus/stdaggregator.cpp b/lib/livestatus/stdaggregator.cpp index d72500661..8d3876e02 100644 --- a/lib/livestatus/stdaggregator.cpp +++ b/lib/livestatus/stdaggregator.cpp @@ -22,8 +22,8 @@ using namespace icinga; -StdAggregator::StdAggregator(const String& attr) - : m_StdAttr(attr) +StdAggregator::StdAggregator(String attr) + : m_StdAttr(std::move(attr)) { } StdAggregatorState *StdAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp index baadf3165..75c4e3e86 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -48,7 +48,7 @@ class StdAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(StdAggregator); - StdAggregator(const String& attr); + StdAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/sumaggregator.cpp b/lib/livestatus/sumaggregator.cpp index 4aee38f77..50d124f05 100644 --- a/lib/livestatus/sumaggregator.cpp +++ b/lib/livestatus/sumaggregator.cpp @@ -21,8 +21,8 @@ using namespace icinga; -SumAggregator::SumAggregator(const String& attr) - : m_SumAttr(attr) +SumAggregator::SumAggregator(String attr) + : m_SumAttr(std::move(attr)) { } SumAggregatorState *SumAggregator::EnsureState(AggregatorState **state) diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index 9215899ea..b2359e642 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -46,7 +46,7 @@ class SumAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(SumAggregator); - SumAggregator(const String& attr); + SumAggregator(String attr); void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; double GetResultAndFreeState(AggregatorState *state) const override; diff --git a/lib/livestatus/zonestable.cpp b/lib/livestatus/zonestable.cpp index 87d086ae0..f94c825ea 100644 --- a/lib/livestatus/zonestable.cpp +++ b/lib/livestatus/zonestable.cpp @@ -91,7 +91,7 @@ Value ZonesTable::EndpointsAccessor(const Value& row) Array::Ptr endpoint_names = new Array(); - for (const Endpoint::Ptr endpoint : endpoints) { + for (const Endpoint::Ptr& endpoint : endpoints) { endpoint_names->Add(endpoint->GetName()); } diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp index 032e4feea..70a757a4f 100644 --- a/lib/methods/icingachecktask.cpp +++ b/lib/methods/icingachecktask.cpp @@ -109,7 +109,7 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResul double bytesSentPerSecond = 0; double bytesReceivedPerSecond = 0; - for (Endpoint::Ptr endpoint : endpoints) + for (const Endpoint::Ptr& endpoint : endpoints) { if (endpoint->GetLastMessageSent() > lastMessageSent) lastMessageSent = endpoint->GetLastMessageSent(); diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp index 3a99cf132..fdb0b0ce5 100644 --- a/lib/perfdata/elasticsearchwriter.cpp +++ b/lib/perfdata/elasticsearchwriter.cpp @@ -36,6 +36,7 @@ #include "base/statsfunction.hpp" #include #include +#include using namespace icinga; @@ -341,7 +342,7 @@ void ElasticsearchWriter::NotificationSentToAllUsersHandlerInternal(const Notifi Enqueue("notification", fields, ts); } -void ElasticsearchWriter::Enqueue(String type, const Dictionary::Ptr& fields, double ts) +void ElasticsearchWriter::Enqueue(const String& type, const Dictionary::Ptr& fields, double ts) { /* Atomically buffer the data point. */ boost::mutex::scoped_lock lock(m_DataBufferMutex); @@ -575,7 +576,7 @@ void ElasticsearchWriter::ExceptionHandler(boost::exception_ptr exp) Log(LogCritical, "ElasticsearchWriter", "Exception during Elastic operation: Verify that your backend is operational!"); Log(LogDebug, "ElasticsearchWriter") - << "Exception during Elasticsearch operation: " << DiagnosticInformation(exp); + << "Exception during Elasticsearch operation: " << DiagnosticInformation(std::move(exp)); } String ElasticsearchWriter::FormatTimestamp(double ts) diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp index 604ae757c..4779fefb2 100644 --- a/lib/perfdata/elasticsearchwriter.hpp +++ b/lib/perfdata/elasticsearchwriter.hpp @@ -66,7 +66,7 @@ private: const Checkable::Ptr& checkable, const std::set& users, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text); - void Enqueue(String type, const Dictionary::Ptr& fields, double ts); + void Enqueue(const String& type, const Dictionary::Ptr& fields, double ts); Stream::Ptr Connect(); void AssertOnWorkQueue(); diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp index 16fd77d94..490672f33 100644 --- a/lib/perfdata/gelfwriter.cpp +++ b/lib/perfdata/gelfwriter.cpp @@ -38,6 +38,7 @@ #include "base/json.hpp" #include "base/statsfunction.hpp" #include +#include using namespace icinga; @@ -122,7 +123,7 @@ void GelfWriter::ExceptionHandler(boost::exception_ptr exp) Log(LogCritical, "GelfWriter", "Exception during Graylog Gelf operation: Verify that your backend is operational!"); Log(LogDebug, "GelfWriter") - << "Exception during Graylog Gelf operation: " << DiagnosticInformation(exp); + << "Exception during Graylog Gelf operation: " << DiagnosticInformation(std::move(exp)); if (GetConnected()) { m_Stream->Close(); diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp index c4721a778..bb5f20bda 100644 --- a/lib/perfdata/graphitewriter.cpp +++ b/lib/perfdata/graphitewriter.cpp @@ -38,6 +38,7 @@ #include #include #include +#include using namespace icinga; @@ -119,7 +120,7 @@ void GraphiteWriter::ExceptionHandler(boost::exception_ptr exp) Log(LogCritical, "GraphiteWriter", "Exception during Graphite operation: Verify that your backend is operational!"); Log(LogDebug, "GraphiteWriter") - << "Exception during Graphite operation: " << DiagnosticInformation(exp); + << "Exception during Graphite operation: " << DiagnosticInformation(std::move(exp)); if (GetConnected()) { m_Stream->Close(); diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp index 6bd99d659..5c4913818 100644 --- a/lib/perfdata/influxdbwriter.cpp +++ b/lib/perfdata/influxdbwriter.cpp @@ -46,6 +46,7 @@ #include #include #include +#include using namespace icinga; @@ -147,7 +148,7 @@ void InfluxdbWriter::ExceptionHandler(boost::exception_ptr exp) Log(LogCritical, "InfluxdbWriter", "Exception during InfluxDB operation: Verify that your backend is operational!"); Log(LogDebug, "InfluxdbWriter") - << "Exception during InfluxDB operation: " << DiagnosticInformation(exp); + << "Exception during InfluxDB operation: " << DiagnosticInformation(std::move(exp)); //TODO: Close the connection, if we keep it open. } diff --git a/lib/remote/apiaction.cpp b/lib/remote/apiaction.cpp index 86f6b1f75..a2ad15737 100644 --- a/lib/remote/apiaction.cpp +++ b/lib/remote/apiaction.cpp @@ -22,8 +22,8 @@ using namespace icinga; -ApiAction::ApiAction(const std::vector& types, const Callback& action) - : m_Types(types), m_Callback(action) +ApiAction::ApiAction(std::vector types, Callback action) + : m_Types(std::move(types)), m_Callback(std::move(action)) { } Value ApiAction::Invoke(const ConfigObject::Ptr& target, const Dictionary::Ptr& params) diff --git a/lib/remote/apiaction.hpp b/lib/remote/apiaction.hpp index 97645b493..9ae6b975c 100644 --- a/lib/remote/apiaction.hpp +++ b/lib/remote/apiaction.hpp @@ -45,7 +45,7 @@ public: typedef std::function Callback; - ApiAction(const std::vector& registerTypes, const Callback& function); + ApiAction(std::vector registerTypes, Callback function); Value Invoke(const ConfigObject::Ptr& target, const Dictionary::Ptr& params); diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp index 2ba8070d2..4b43d5ebc 100644 --- a/lib/remote/apiclient.cpp +++ b/lib/remote/apiclient.cpp @@ -27,8 +27,8 @@ using namespace icinga; ApiClient::ApiClient(const String& host, const String& port, - const String& user, const String& password) - : m_Connection(new HttpClientConnection(host, port, true)), m_User(user), m_Password(password) + String user, String password) + : m_Connection(new HttpClientConnection(host, port, true)), m_User(std::move(user)), m_Password(std::move(password)) { m_Connection->Start(); } diff --git a/lib/remote/apiclient.hpp b/lib/remote/apiclient.hpp index cd3acadfe..7507765a0 100644 --- a/lib/remote/apiclient.hpp +++ b/lib/remote/apiclient.hpp @@ -90,7 +90,7 @@ public: DECLARE_PTR_TYPEDEFS(ApiClient); ApiClient(const String& host, const String& port, - const String& user, const String& password); + String user, String password); typedef std::function&)> TypesCompletionCallback; void GetTypes(const TypesCompletionCallback& callback) const; diff --git a/lib/remote/apifunction.cpp b/lib/remote/apifunction.cpp index 4cafab1d7..b549bef29 100644 --- a/lib/remote/apifunction.cpp +++ b/lib/remote/apifunction.cpp @@ -22,8 +22,8 @@ using namespace icinga; -ApiFunction::ApiFunction(const Callback& function) - : m_Callback(function) +ApiFunction::ApiFunction(Callback function) + : m_Callback(std::move(function)) { } Value ApiFunction::Invoke(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& arguments) diff --git a/lib/remote/apifunction.hpp b/lib/remote/apifunction.hpp index a2b652da9..8e41040ab 100644 --- a/lib/remote/apifunction.hpp +++ b/lib/remote/apifunction.hpp @@ -42,7 +42,7 @@ public: typedef std::function Callback; - ApiFunction(const Callback& function); + ApiFunction(Callback function); Value Invoke(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& arguments); diff --git a/lib/remote/eventqueue.cpp b/lib/remote/eventqueue.cpp index 965f71092..80fd16059 100644 --- a/lib/remote/eventqueue.cpp +++ b/lib/remote/eventqueue.cpp @@ -24,8 +24,8 @@ using namespace icinga; -EventQueue::EventQueue(const String& name) - : m_Name(name) +EventQueue::EventQueue(String name) + : m_Name(std::move(name)) { } bool EventQueue::CanProcessEvent(const String& type) const diff --git a/lib/remote/eventqueue.hpp b/lib/remote/eventqueue.hpp index b6b4f3a48..56fe23c6f 100644 --- a/lib/remote/eventqueue.hpp +++ b/lib/remote/eventqueue.hpp @@ -37,7 +37,7 @@ class EventQueue final : public Object public: DECLARE_PTR_TYPEDEFS(EventQueue); - EventQueue(const String& name); + EventQueue(String name); bool CanProcessEvent(const String& type) const; void ProcessEvent(const Dictionary::Ptr& event); diff --git a/lib/remote/httpclientconnection.cpp b/lib/remote/httpclientconnection.cpp index 20ab83a63..28d6e50fa 100644 --- a/lib/remote/httpclientconnection.cpp +++ b/lib/remote/httpclientconnection.cpp @@ -31,8 +31,8 @@ using namespace icinga; -HttpClientConnection::HttpClientConnection(const String& host, const String& port, bool tls) - : m_Host(host), m_Port(port), m_Tls(tls) +HttpClientConnection::HttpClientConnection(String host, String port, bool tls) + : m_Host(std::move(host)), m_Port(std::move(port)), m_Tls(tls) { } void HttpClientConnection::Start() diff --git a/lib/remote/httpclientconnection.hpp b/lib/remote/httpclientconnection.hpp index 9b379e5a5..752c40c22 100644 --- a/lib/remote/httpclientconnection.hpp +++ b/lib/remote/httpclientconnection.hpp @@ -39,7 +39,7 @@ class HttpClientConnection final : public Object public: DECLARE_PTR_TYPEDEFS(HttpClientConnection); - HttpClientConnection(const String& host, const String& port, bool tls = true); + HttpClientConnection(String host, String port, bool tls = true); void Start(); diff --git a/lib/remote/httprequest.cpp b/lib/remote/httprequest.cpp index e30d4e9ad..33fe195e1 100644 --- a/lib/remote/httprequest.cpp +++ b/lib/remote/httprequest.cpp @@ -27,11 +27,11 @@ using namespace icinga; -HttpRequest::HttpRequest(const Stream::Ptr& stream) +HttpRequest::HttpRequest(Stream::Ptr stream) : Complete(false), ProtocolVersion(HttpVersion11), Headers(new Dictionary()), - m_Stream(stream), + m_Stream(std::move(stream)), m_State(HttpRequestStart) { } diff --git a/lib/remote/httprequest.hpp b/lib/remote/httprequest.hpp index 258bacdb7..b59917283 100644 --- a/lib/remote/httprequest.hpp +++ b/lib/remote/httprequest.hpp @@ -60,7 +60,7 @@ public: Dictionary::Ptr Headers; - HttpRequest(const Stream::Ptr& stream); + HttpRequest(Stream::Ptr stream); bool Parse(StreamReadContext& src, bool may_wait); size_t ReadBody(char *data, size_t count); diff --git a/lib/remote/httpresponse.cpp b/lib/remote/httpresponse.cpp index 373d088e0..f87602a24 100644 --- a/lib/remote/httpresponse.cpp +++ b/lib/remote/httpresponse.cpp @@ -27,8 +27,8 @@ using namespace icinga; -HttpResponse::HttpResponse(const Stream::Ptr& stream, const HttpRequest& request) - : Complete(false), m_State(HttpResponseStart), m_Request(request), m_Stream(stream) +HttpResponse::HttpResponse(Stream::Ptr stream, const HttpRequest& request) + : Complete(false), m_State(HttpResponseStart), m_Request(request), m_Stream(std::move(stream)) { } void HttpResponse::SetStatus(int code, const String& message) diff --git a/lib/remote/httpresponse.hpp b/lib/remote/httpresponse.hpp index 98e740a86..5ce267bf3 100644 --- a/lib/remote/httpresponse.hpp +++ b/lib/remote/httpresponse.hpp @@ -52,7 +52,7 @@ public: Dictionary::Ptr Headers; - HttpResponse(const Stream::Ptr& stream, const HttpRequest& request); + HttpResponse(Stream::Ptr stream, const HttpRequest& request); bool Parse(StreamReadContext& src, bool may_wait); size_t ReadBody(char *data, size_t count); diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp index 4f4977f28..af7c9f219 100644 --- a/lib/remote/jsonrpcconnection.cpp +++ b/lib/remote/jsonrpcconnection.cpp @@ -42,8 +42,8 @@ static int l_JsonRpcConnectionNextID; static Timer::Ptr l_HeartbeatTimer; JsonRpcConnection::JsonRpcConnection(const String& identity, bool authenticated, - const TlsStream::Ptr& stream, ConnectionRole role) - : m_ID(l_JsonRpcConnectionNextID++), m_Identity(identity), m_Authenticated(authenticated), m_Stream(stream), + TlsStream::Ptr stream, ConnectionRole role) + : m_ID(l_JsonRpcConnectionNextID++), m_Identity(identity), m_Authenticated(authenticated), m_Stream(std::move(stream)), m_Role(role), m_Timestamp(Utility::GetTime()), m_Seen(Utility::GetTime()), m_NextHeartbeat(0), m_HeartbeatTimeout(0) { boost::call_once(l_JsonRpcConnectionOnceFlag, &JsonRpcConnection::StaticInitialize); diff --git a/lib/remote/jsonrpcconnection.hpp b/lib/remote/jsonrpcconnection.hpp index 462ef627c..0d16606c8 100644 --- a/lib/remote/jsonrpcconnection.hpp +++ b/lib/remote/jsonrpcconnection.hpp @@ -53,7 +53,7 @@ class JsonRpcConnection final : public Object public: DECLARE_PTR_TYPEDEFS(JsonRpcConnection); - JsonRpcConnection(const String& identity, bool authenticated, const TlsStream::Ptr& stream, ConnectionRole role); + JsonRpcConnection(const String& identity, bool authenticated, TlsStream::Ptr stream, ConnectionRole role); void Start(); diff --git a/lib/remote/url.cpp b/lib/remote/url.cpp index f7e068f8c..d10a62d47 100644 --- a/lib/remote/url.cpp +++ b/lib/remote/url.cpp @@ -270,7 +270,7 @@ String Url::Format(bool onlyPathAndQuery, bool printCredentials) const // Array String temp; - for (const String s : kv.second) { + for (const String& s : kv.second) { if (!temp.IsEmpty()) temp += "&"; @@ -351,7 +351,7 @@ bool Url::ParsePort(const String& port) bool Url::ParsePath(const String& path) { - std::string pathStr = path; + const std::string& pathStr = path; boost::char_separator sep("/"); boost::tokenizer > tokens(pathStr, sep); @@ -371,7 +371,7 @@ bool Url::ParsePath(const String& path) bool Url::ParseQuery(const String& query) { /* Tokenizer does not like String AT ALL */ - std::string queryStr = query; + const std::string& queryStr = query; boost::char_separator sep("&"); boost::tokenizer > tokens(queryStr, sep); diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 047d4670b..3d48c25f5 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -35,9 +36,9 @@ using namespace icinga; -ClassCompiler::ClassCompiler(const std::string& path, std::istream& input, +ClassCompiler::ClassCompiler(std::string path, std::istream& input, std::ostream& oimpl, std::ostream& oheader) - : m_Path(path), m_Input(input), m_Impl(oimpl), m_Header(oheader) + : m_Path(std::move(path)), m_Input(input), m_Impl(oimpl), m_Header(oheader) { InitializeScanner(); } diff --git a/tools/mkclass/classcompiler.hpp b/tools/mkclass/classcompiler.hpp index 67a50070d..d01d5e90c 100644 --- a/tools/mkclass/classcompiler.hpp +++ b/tools/mkclass/classcompiler.hpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -53,8 +54,8 @@ struct FieldAccessor std::string Accessor; bool Pure; - FieldAccessor(FieldAccessorType type, const std::string& accessor, bool pure) - : Type(type), Accessor(accessor), Pure(pure) + FieldAccessor(FieldAccessorType type, std::string accessor, bool pure) + : Type(type), Accessor(std::move(accessor)), Pure(pure) { } }; @@ -207,7 +208,7 @@ struct Validator class ClassCompiler { public: - ClassCompiler(const std::string& path, std::istream& input, std::ostream& oimpl, std::ostream& oheader); + ClassCompiler(std::string path, std::istream& input, std::ostream& oimpl, std::ostream& oheader); ~ClassCompiler(); void Compile(); From d6062eefbf918b1a5b1388a4a5f7d7615bd223eb Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 08:59:00 +0100 Subject: [PATCH 05/12] Apply clang-tidy fix 'modernize-raw-string-literal' --- lib/perfdata/elasticsearchwriter.cpp | 2 +- lib/remote/infohandler.cpp | 2 +- test/config-ops.cpp | 22 +++++++++++----------- tools/mkclass/classcompiler.cpp | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp index fdb0b0ce5..4711cd9ac 100644 --- a/lib/perfdata/elasticsearchwriter.cpp +++ b/lib/perfdata/elasticsearchwriter.cpp @@ -358,7 +358,7 @@ void ElasticsearchWriter::Enqueue(const String& type, const Dictionary::Ptr& fie * We do it this way to avoid problems with a near full queue. */ - String indexBody = "{ \"index\" : { \"_type\" : \"" + eventType + "\" } }\n"; + String indexBody = R"({ "index" : { "_type" : ")" + eventType + "\" } }\n"; String fieldsBody = JsonEncode(fields); Log(LogDebug, "ElasticsearchWriter") diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp index c09483692..754948d33 100644 --- a/lib/remote/infohandler.cpp +++ b/lib/remote/infohandler.cpp @@ -98,7 +98,7 @@ bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, } else body += "Your user does not have any permissions.

"; - body += "

More information about API requests is available in the documentation.

"; + body += R"(

More information about API requests is available in the documentation.

)"; response.WriteBody(body.CStr(), body.GetLength()); } diff --git a/test/config-ops.cpp b/test/config-ops.cpp index ac7817d37..c47ab0305 100644 --- a/test/config-ops.cpp +++ b/test/config-ops.cpp @@ -109,34 +109,34 @@ BOOST_AUTO_TEST_CASE(simple) expr = ConfigCompiler::CompileText("", "256 >> 4 >> 3"); BOOST_CHECK(expr->Evaluate(frame).GetValue() == 2); - expr = ConfigCompiler::CompileText("", "\"hello\" == \"hello\""); + expr = ConfigCompiler::CompileText("", R"("hello" == "hello")"); BOOST_CHECK(expr->Evaluate(frame).GetValue()); - expr = ConfigCompiler::CompileText("", "\"hello\" != \"hello\""); + expr = ConfigCompiler::CompileText("", R"("hello" != "hello")"); BOOST_CHECK(!expr->Evaluate(frame).GetValue()); - expr = ConfigCompiler::CompileText("", "\"foo\" in [ \"foo\", \"bar\" ]"); + expr = ConfigCompiler::CompileText("", R"("foo" in [ "foo", "bar" ])"); BOOST_CHECK(expr->Evaluate(frame).GetValue()); - expr = ConfigCompiler::CompileText("", "\"foo\" in [ \"bar\", \"baz\" ]"); + expr = ConfigCompiler::CompileText("", R"("foo" in [ "bar", "baz" ])"); BOOST_CHECK(!expr->Evaluate(frame).GetValue()); expr = ConfigCompiler::CompileText("", "\"foo\" in null"); BOOST_CHECK(!expr->Evaluate(frame).GetValue()); - expr = ConfigCompiler::CompileText("", "\"foo\" in \"bar\""); + expr = ConfigCompiler::CompileText("", R"("foo" in "bar")"); BOOST_CHECK_THROW(expr->Evaluate(frame).GetValue(), ScriptError); - expr = ConfigCompiler::CompileText("", "\"foo\" !in [ \"bar\", \"baz\" ]"); + expr = ConfigCompiler::CompileText("", R"("foo" !in [ "bar", "baz" ])"); BOOST_CHECK(expr->Evaluate(frame).GetValue()); - expr = ConfigCompiler::CompileText("", "\"foo\" !in [ \"foo\", \"bar\" ]"); + expr = ConfigCompiler::CompileText("", R"("foo" !in [ "foo", "bar" ])"); BOOST_CHECK(!expr->Evaluate(frame).GetValue()); expr = ConfigCompiler::CompileText("", "\"foo\" !in null"); BOOST_CHECK(expr->Evaluate(frame).GetValue()); - expr = ConfigCompiler::CompileText("", "\"foo\" !in \"bar\""); + expr = ConfigCompiler::CompileText("", R"("foo" !in "bar")"); BOOST_CHECK_THROW(expr->Evaluate(frame).GetValue(), ScriptError); expr = ConfigCompiler::CompileText("", "{ a += 3 }"); @@ -156,10 +156,10 @@ BOOST_AUTO_TEST_CASE(simple) expr = ConfigCompiler::CompileText("", "\"test\" + 3"); BOOST_CHECK(expr->Evaluate(frame).GetValue() == "test3"); - expr = ConfigCompiler::CompileText("", "\"\\\"te\\\\st\""); + expr = ConfigCompiler::CompileText("", R"("\"te\\st")"); BOOST_CHECK(expr->Evaluate(frame).GetValue() == "\"te\\st"); - expr = ConfigCompiler::CompileText("", "\"\\'test\""); + expr = ConfigCompiler::CompileText("", R"("\'test")"); BOOST_CHECK_THROW(expr->Evaluate(frame).GetValue(), ScriptError); expr = ConfigCompiler::CompileText("", "({ a = 3\nb = 3 })"); @@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE(advanced) std::unique_ptr expr; Function::Ptr func; - expr = ConfigCompiler::CompileText("", "regex(\"^Hello\", \"Hello World\")"); + expr = ConfigCompiler::CompileText("", R"(regex("^Hello", "Hello World"))"); BOOST_CHECK(expr->Evaluate(frame).GetValue()); expr = ConfigCompiler::CompileText("", "__boost_test()"); diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 3d48c25f5..dca909ae0 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -494,7 +494,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) else m_Impl << "\t" << "if (" << argName << ".IsEmpty())" << std::endl; - m_Impl << "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast(this), { \"" << field.Name << "\" }, \"Attribute must not be empty.\"));" << std::endl << std::endl; + m_Impl << "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast(this), { \"" << field.Name << R"(" }, "Attribute must not be empty."));)" << std::endl << std::endl; } if (field.Attributes & FADeprecated) { @@ -503,7 +503,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) else m_Impl << "\t" << "if (" << argName << " != GetDefault" << field.GetFriendlyName() << "())" << std::endl; - m_Impl << "\t\t" << "Log(LogWarning, \"" << klass.Name << "\") << \"Attribute '" << field.Name << "' for object '\" << dynamic_cast(this)->GetName() << \"' of type '\" << dynamic_cast(this)->GetReflectionType()->GetName() << \"' is deprecated and should not be used.\";" << std::endl; + m_Impl << "\t\t" << "Log(LogWarning, \"" << klass.Name << "\") << \"Attribute '" << field.Name << R"(' for object '" << dynamic_cast(this)->GetName() << "' of type '" << dynamic_cast(this)->GetReflectionType()->GetName() << "' is deprecated and should not be used.";)" << std::endl; } if (field.Type.ArrayRank > 0) { @@ -518,7 +518,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) m_Impl << "\t" << "if (value.IsObjectType()) {" << std::endl << "\t\t" << "Function::Ptr func = value;" << std::endl << "\t\t" << "if (func->IsDeprecated())" << std::endl - << "\t\t\t" << "Log(LogWarning, \"" << klass.Name << "\") << \"Attribute '" << field.Name << "' for object '\" << dynamic_cast(this)->GetName() << \"' of type '\" << dynamic_cast(this)->GetReflectionType()->GetName() << \"' is set to a deprecated function: \" << func->GetName();" << std::endl + << "\t\t\t" << "Log(LogWarning, \"" << klass.Name << "\") << \"Attribute '" << field.Name << R"(' for object '" << dynamic_cast(this)->GetName() << "' of type '" << dynamic_cast(this)->GetReflectionType()->GetName() << "' is set to a deprecated function: " << func->GetName();)" << std::endl << "\t" << "}" << std::endl << std::endl; } @@ -531,13 +531,13 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) m_Impl << "!value.IsEmpty() && "; m_Impl << "!utils.ValidateName(\"" << field.Type.TypeName << "\", value))" << std::endl - << "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast(this), { \"" << field.Name << "\" }, \"Object '\" + value + \"' of type '" << field.Type.TypeName + << "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast(this), { \"" << field.Name << R"(" }, "Object '" + value + "' of type ')" << field.Type.TypeName << "' does not exist.\"));" << std::endl; } else if (field.Type.ArrayRank > 0 && (ftype == "Number" || ftype == "Boolean")) { m_Impl << "\t" << "try {" << std::endl << "\t\t" << "Convert::ToDouble(value);" << std::endl << "\t" << "} catch (const std::invalid_argument&) {" << std::endl - << "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast(this), { \"" << field.Name << "\", \"Array element '\" + value + \"' of type '\" + value.GetReflectionType()->GetName() + \"' is not valid here; expected type '" << ftype << "'.\"));" << std::endl + << "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast(this), { \"" << field.Name << R"(", "Array element '" + value + "' of type '" + value.GetReflectionType()->GetName() + "' is not valid here; expected type ')" << ftype << "'.\"));" << std::endl << "\t" << "}" << std::endl; } @@ -1144,7 +1144,7 @@ void ClassCompiler::CodeGenValidator(const std::string& name, const std::string& << "\t\t\t" << "if (utils.ValidateName(\"" << rule.Type << "\", value))" << std::endl << "\t\t\t\t" << "return;" << std::endl << "\t\t\t" << "else" << std::endl - << "\t\t\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_pointer_cast(object), location, \"Object '\" + value + \"' of type '" << rule.Type << "' does not exist.\"));" << std::endl + << "\t\t\t\t" << R"(BOOST_THROW_EXCEPTION(ValidationError(dynamic_pointer_cast(object), location, "Object '" + value + "' of type ')" << rule.Type << "' does not exist.\"));" << std::endl << "\t\t" << "}" << std::endl; } From e3ad0be7698a426d631668f16f7a71d3f3a5a3b6 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 09:07:03 +0100 Subject: [PATCH 06/12] Apply clang-tidy fix 'modernize-use-auto' --- icinga-studio/icinga-studio.cpp | 2 +- lib/base/base64.cpp | 2 +- lib/base/configobject.cpp | 12 ++++++------ lib/base/configobject.hpp | 2 +- lib/base/configtype.cpp | 2 +- lib/base/exception.cpp | 16 ++++++++-------- lib/base/fifo.cpp | 2 +- lib/base/filelogger.cpp | 2 +- lib/base/json.cpp | 14 +++++++------- lib/base/objectlock.cpp | 4 ++-- lib/base/process.cpp | 8 ++++---- lib/base/scriptutils.cpp | 8 ++++---- lib/base/tlsstream.cpp | 4 ++-- lib/base/tlsutility.cpp | 4 ++-- lib/base/utility.cpp | 2 +- lib/base/value.hpp | 2 +- lib/cli/troubleshootcommand.cpp | 4 ++-- lib/compat/compatlogger.cpp | 2 +- lib/config/configcompilercontext.cpp | 2 +- lib/config/configitem.cpp | 2 +- lib/config/configitembuilder.cpp | 4 ++-- lib/config/expression.cpp | 10 +++++----- lib/config/vmops.hpp | 2 +- lib/db_ido/dbconnection.cpp | 4 ++-- lib/db_ido/idochecktask.cpp | 2 +- lib/db_ido_mysql/idomysqlconnection.cpp | 4 ++-- lib/db_ido_pgsql/idopgsqlconnection.cpp | 4 ++-- lib/icinga/checkable-dependency.cpp | 2 +- lib/icinga/checkable.cpp | 4 ++-- lib/icinga/macroprocessor.cpp | 2 +- lib/livestatus/statustable.cpp | 8 ++++---- lib/methods/pluginnotificationtask.cpp | 2 +- lib/perfdata/elasticsearchwriter.cpp | 2 +- lib/remote/apilistener-configsync.cpp | 6 +++--- lib/remote/apilistener.cpp | 4 ++-- lib/remote/authority.cpp | 2 +- lib/remote/configobjectutility.cpp | 2 +- lib/remote/createobjecthandler.cpp | 2 +- lib/remote/filterutility.cpp | 2 +- test/base-array.cpp | 2 +- test/base-dictionary.cpp | 2 +- tools/mkclass/classcompiler.cpp | 6 +++--- 42 files changed, 87 insertions(+), 87 deletions(-) diff --git a/icinga-studio/icinga-studio.cpp b/icinga-studio/icinga-studio.cpp index 1d3e657a3..d6e85662f 100644 --- a/icinga-studio/icinga-studio.cpp +++ b/icinga-studio/icinga-studio.cpp @@ -56,7 +56,7 @@ public: pUrl = new Url(argv[1].ToStdString()); } - MainForm *m = new MainForm(nullptr, pUrl); + auto *m = new MainForm(nullptr, pUrl); m->Show(); return true; diff --git a/lib/base/base64.cpp b/lib/base/base64.cpp index 896f92934..368dca878 100644 --- a/lib/base/base64.cpp +++ b/lib/base/base64.cpp @@ -51,7 +51,7 @@ String Base64::Decode(const String& input) BIO_push(bio64, biomem); BIO_set_flags(bio64, BIO_FLAGS_BASE64_NO_NL); - char *outbuf = new char[input.GetLength()]; + auto *outbuf = new char[input.GetLength()]; size_t len = 0; int rc; diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index 3f24c36ca..a4370d6df 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -97,7 +97,7 @@ public: bool ValidateName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(type); - ConfigType *dtype = dynamic_cast(ptype.get()); + auto *dtype = dynamic_cast(ptype.get()); if (!dtype) return false; @@ -503,7 +503,7 @@ void ConfigObject::DumpObjects(const String& filename, int attributeTypes) StdioStream::Ptr sfp = new StdioStream(&fp, false); for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; @@ -605,7 +605,7 @@ void ConfigObject::RestoreObjects(const String& filename, int attributeTypes) unsigned long no_state = 0; for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; @@ -627,7 +627,7 @@ void ConfigObject::RestoreObjects(const String& filename, int attributeTypes) void ConfigObject::StopObjects() { for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; @@ -641,7 +641,7 @@ void ConfigObject::StopObjects() void ConfigObject::DumpModifiedAttributes(const std::function& callback) { for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; @@ -703,7 +703,7 @@ void ConfigObject::DumpModifiedAttributes(const std::function(ptype.get()); + auto *ctype = dynamic_cast(ptype.get()); if (!ctype) return nullptr; diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp index abb4e0120..8ff068fc5 100644 --- a/lib/base/configobject.hpp +++ b/lib/base/configobject.hpp @@ -82,7 +82,7 @@ public: static intrusive_ptr GetObject(const String& name) { typedef TypeImpl ObjType; - ObjType *ptype = static_cast(T::TypeInstance.get()); + auto *ptype = static_cast(T::TypeInstance.get()); return static_pointer_cast(ptype->GetObject(name)); } diff --git a/lib/base/configtype.cpp b/lib/base/configtype.cpp index 4306df1bd..0c3aa68ed 100644 --- a/lib/base/configtype.cpp +++ b/lib/base/configtype.cpp @@ -51,7 +51,7 @@ void ConfigType::RegisterObject(const ConfigObject::Ptr& object) if (it->second == object) return; - Type *type = dynamic_cast(this); + auto *type = dynamic_cast(this); BOOST_THROW_EXCEPTION(ScriptError("An object with type '" + type->GetName() + "' and name '" + name + "' already exists (" + Convert::ToString(it->second->GetDebugInfo()) + "), new declaration: " + Convert::ToString(object->GetDebugInfo()), diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index ceddeecbe..46927d66e 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -58,8 +58,8 @@ inline void *cast_exception(void *obj, const std::type_info *src, const std::typ else return nullptr; #else /* __GLIBCXX__ */ - const libcxx_type_info *srcInfo = static_cast(src); - const libcxx_type_info *dstInfo = static_cast(dst); + const auto *srcInfo = static_cast(src); + const auto *dstInfo = static_cast(dst); void *adj = obj; @@ -104,7 +104,7 @@ void icinga::RethrowUncaughtException() extern "C" void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *)) { - std::type_info *tinfo = static_cast(pvtinfo); + auto *tinfo = static_cast(pvtinfo); typedef void (*cxa_throw_fn)(void *, std::type_info *, void (*)(void *)) __attribute__((noreturn)); static cxa_throw_fn real_cxa_throw; @@ -120,7 +120,7 @@ void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *)) #ifndef NO_CAST_EXCEPTION void *uex = cast_exception(obj, tinfo, &typeid(user_error)); - boost::exception *ex = reinterpret_cast(cast_exception(obj, tinfo, &typeid(boost::exception))); + auto *ex = reinterpret_cast(cast_exception(obj, tinfo, &typeid(boost::exception))); if (!uex) { #endif /* NO_CAST_EXCEPTION */ @@ -171,14 +171,14 @@ String icinga::DiagnosticInformation(const std::exception& ex, bool verbose, Sta String message = ex.what(); - const ValidationError *vex = dynamic_cast(&ex); + const auto *vex = dynamic_cast(&ex); if (message.IsEmpty()) result << boost::diagnostic_information(ex) << "\n"; else result << "Error: " << message << "\n"; - const ScriptError *dex = dynamic_cast(&ex); + const auto *dex = dynamic_cast(&ex); if (dex && !dex->GetDebugInfo().Path.IsEmpty()) ShowCodeLocation(result, dex->GetDebugInfo()); @@ -223,8 +223,8 @@ String icinga::DiagnosticInformation(const std::exception& ex, bool verbose, Sta ShowCodeLocation(result, di); } - const user_error *uex = dynamic_cast(&ex); - const posix_error *pex = dynamic_cast(&ex); + const auto *uex = dynamic_cast(&ex); + const auto *pex = dynamic_cast(&ex); if (!uex && !pex && verbose) { const StackTrace *st = boost::get_error_info(ex); diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp index b5a3fa0fa..e4912ce78 100644 --- a/lib/base/fifo.cpp +++ b/lib/base/fifo.cpp @@ -51,7 +51,7 @@ void FIFO::ResizeBuffer(size_t newSize, bool decrease) if (newSize == m_AllocSize) return; - char *newBuffer = static_cast(realloc(m_Buffer, newSize)); + auto *newBuffer = static_cast(realloc(m_Buffer, newSize)); if (!newBuffer) BOOST_THROW_EXCEPTION(std::bad_alloc()); diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp index 1047290ce..3216ae1ec 100644 --- a/lib/base/filelogger.cpp +++ b/lib/base/filelogger.cpp @@ -55,7 +55,7 @@ void FileLogger::Start(bool runtimeCreated) void FileLogger::ReopenLogFile() { - std::ofstream *stream = new std::ofstream(); + auto *stream = new std::ofstream(); String path = GetPath(); diff --git a/lib/base/json.cpp b/lib/base/json.cpp index 505d0bea2..0f4f5453e 100644 --- a/lib/base/json.cpp +++ b/lib/base/json.cpp @@ -205,7 +205,7 @@ private: static int DecodeNull(void *ctx) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { context->AddValue(Empty); @@ -219,7 +219,7 @@ static int DecodeNull(void *ctx) static int DecodeBoolean(void *ctx, int value) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { context->AddValue(static_cast(value)); @@ -233,7 +233,7 @@ static int DecodeBoolean(void *ctx, int value) static int DecodeNumber(void *ctx, const char *str, yajl_size len) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { String jstr = String(str, str + len); @@ -248,7 +248,7 @@ static int DecodeNumber(void *ctx, const char *str, yajl_size len) static int DecodeString(void *ctx, const unsigned char *str, yajl_size len) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { context->AddValue(String(str, str + len)); @@ -262,7 +262,7 @@ static int DecodeString(void *ctx, const unsigned char *str, yajl_size len) static int DecodeStartMap(void *ctx) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { context->Push(new Dictionary()); @@ -276,7 +276,7 @@ static int DecodeStartMap(void *ctx) static int DecodeEndMapOrArray(void *ctx) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { context->AddValue(context->Pop().EValue); @@ -290,7 +290,7 @@ static int DecodeEndMapOrArray(void *ctx) static int DecodeStartArray(void *ctx) { - JsonContext *context = static_cast(ctx); + auto *context = static_cast(ctx); try { context->Push(new Array()); diff --git a/lib/base/objectlock.cpp b/lib/base/objectlock.cpp index a15682025..a1b4a8ae6 100644 --- a/lib/base/objectlock.cpp +++ b/lib/base/objectlock.cpp @@ -62,7 +62,7 @@ void ObjectLock::LockMutex(const Object *object) while (likely(!__sync_bool_compare_and_swap(&object->m_Mutex, I2MUTEX_UNLOCKED, I2MUTEX_LOCKED))) { #endif /* _WIN32 */ if (likely(object->m_Mutex > I2MUTEX_LOCKED)) { - boost::recursive_mutex *mtx = reinterpret_cast(object->m_Mutex); + auto *mtx = reinterpret_cast(object->m_Mutex); mtx->lock(); return; @@ -72,7 +72,7 @@ void ObjectLock::LockMutex(const Object *object) it++; } - boost::recursive_mutex *mtx = new boost::recursive_mutex(); + auto *mtx = new boost::recursive_mutex(); mtx->lock(); #ifdef _WIN32 # ifdef _WIN64 diff --git a/lib/base/process.cpp b/lib/base/process.cpp index c9cced610..fbd7d1928 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -93,14 +93,14 @@ static Value ProcessSpawnImpl(struct msghdr *msgh, const Dictionary::Ptr& reques return Empty; } - int *fds = (int *)CMSG_DATA(cmsg); + auto *fds = (int *)CMSG_DATA(cmsg); Array::Ptr arguments = request->Get("arguments"); Dictionary::Ptr extraEnvironment = request->Get("extraEnvironment"); bool adjustPriority = request->Get("adjustPriority"); // build argv - char **argv = new char *[arguments->GetLength() + 1]; + auto **argv = new char *[arguments->GetLength() + 1]; for (unsigned int i = 0; i < arguments->GetLength(); i++) { String arg = arguments->Get(i); @@ -116,7 +116,7 @@ static Value ProcessSpawnImpl(struct msghdr *msgh, const Dictionary::Ptr& reques while (environ[envc]) envc++; - char **envp = new char *[envc + (extraEnvironment ? extraEnvironment->GetLength() : 0) + 2]; + auto **envp = new char *[envc + (extraEnvironment ? extraEnvironment->GetLength() : 0) + 2]; for (int i = 0; i < envc; i++) envp[i] = strdup(environ[i]); @@ -281,7 +281,7 @@ static void ProcessHandler() break; } - char *mbuf = new char[length]; + auto *mbuf = new char[length]; size_t count = 0; while (count < length) { diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp index c9521dc7f..6dd27b464 100644 --- a/lib/base/scriptutils.cpp +++ b/lib/base/scriptutils.cpp @@ -310,7 +310,7 @@ Array::Ptr ScriptUtils::Intersection(const std::vector& arguments) Array::SizeType len; { ObjectLock olock(arr1), xlock(arr2), ylock(result); - Array::Iterator it = std::set_intersection(arr1->Begin(), arr1->End(), arr2->Begin(), arr2->End(), result->Begin()); + auto it = std::set_intersection(arr1->Begin(), arr1->End(), arr2->Begin(), arr2->End(), result->Begin()); len = it - result->Begin(); } result->Resize(len); @@ -334,7 +334,7 @@ void ScriptUtils::Log(const std::vector& arguments) facility = "config"; message = arguments[0]; } else { - int sval = static_cast(arguments[0]); + auto sval = static_cast(arguments[0]); severity = static_cast(sval); facility = arguments[1]; message = arguments[2]; @@ -410,7 +410,7 @@ ConfigObject::Ptr ScriptUtils::GetObject(const Value& vtype, const String& name) else ptype = Type::GetByName(vtype); - ConfigType *ctype = dynamic_cast(ptype.get()); + auto *ctype = dynamic_cast(ptype.get()); if (!ctype) return nullptr; @@ -423,7 +423,7 @@ Array::Ptr ScriptUtils::GetObjects(const Type::Ptr& type) if (!type) BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid type: Must not be null")); - ConfigType *ctype = dynamic_cast(type.get()); + auto *ctype = dynamic_cast(type.get()); if (!ctype) BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid type: Type must inherit from 'ConfigObject'")); diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp index cced491dd..029c9b446 100644 --- a/lib/base/tlsstream.cpp +++ b/lib/base/tlsstream.cpp @@ -89,8 +89,8 @@ TlsStream::~TlsStream() int TlsStream::ValidateCertificate(int preverify_ok, X509_STORE_CTX *ctx) { - SSL *ssl = static_cast(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx())); - TlsStream *stream = static_cast(SSL_get_ex_data(ssl, m_SSLIndex)); + auto *ssl = static_cast(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx())); + auto *stream = static_cast(SSL_get_ex_data(ssl, m_SSLIndex)); if (!preverify_ok) { stream->m_VerifyOK = false; diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp index 9529919ac..4746d8e83 100644 --- a/lib/base/tlsutility.cpp +++ b/lib/base/tlsutility.cpp @@ -737,7 +737,7 @@ String SHA256(const String& s) String RandomString(int length) { - unsigned char *bytes = new unsigned char[length]; + auto *bytes = new unsigned char[length]; if (!RAND_bytes(bytes, length)) { delete [] bytes; @@ -751,7 +751,7 @@ String RandomString(int length) << errinfo_openssl_error(ERR_peek_error())); } - char *output = new char[length * 2 + 1]; + auto *output = new char[length * 2 + 1]; for (int i = 0; i < length; i++) sprintf(output + 2 * i, "%02x", bytes[i]); diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index f80b42933..adf5a7bcd 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -1012,7 +1012,7 @@ String Utility::FormatDuration(double duration) String Utility::FormatDateTime(const char *format, double ts) { char timestamp[128]; - time_t tempts = (time_t)ts; /* We don't handle sub-second timestamps here just yet. */ + auto tempts = (time_t)ts; /* We don't handle sub-second timestamps here just yet. */ tm tmthen; #ifdef _MSC_VER diff --git a/lib/base/value.hpp b/lib/base/value.hpp index ab848da0e..bff889ec8 100644 --- a/lib/base/value.hpp +++ b/lib/base/value.hpp @@ -114,7 +114,7 @@ public: if (!IsObject()) BOOST_THROW_EXCEPTION(std::runtime_error("Cannot convert value of type '" + GetTypeName() + "' to an object.")); - const Object::Ptr& object = Get(); + const auto& object = Get(); ASSERT(object); diff --git a/lib/cli/troubleshootcommand.cpp b/lib/cli/troubleshootcommand.cpp index e86454225..aabd9e41a 100644 --- a/lib/cli/troubleshootcommand.cpp +++ b/lib/cli/troubleshootcommand.cpp @@ -69,7 +69,7 @@ public: #endif /*_WIN32*/ } else { - std::ofstream *ofs = new std::ofstream(); + auto *ofs = new std::ofstream(); ofs->open(path.CStr(), std::ios::out | std::ios::trunc); m_Stream = ofs; } @@ -550,7 +550,7 @@ void TroubleshootCommand::CheckObjectFile(const String& objectfile, InfoLog& log bool TroubleshootCommand::PrintVarsFile(const String& path, const bool console) { if (!console) { - std::ofstream *ofs = new std::ofstream(); + auto *ofs = new std::ofstream(); ofs->open((path+"-vars").CStr(), std::ios::out | std::ios::trunc); if (!ofs->is_open()) return false; diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp index ddcbf1f86..d618b6caa 100644 --- a/lib/compat/compatlogger.cpp +++ b/lib/compat/compatlogger.cpp @@ -533,7 +533,7 @@ void CompatLogger::ReopenFile(bool rotate) void CompatLogger::ScheduleNextRotation() { - time_t now = (time_t)Utility::GetTime(); + auto now = (time_t)Utility::GetTime(); String method = GetRotationMethod(); tm tmthen; diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp index 011ae68a2..e6596c601 100644 --- a/lib/config/configcompilercontext.cpp +++ b/lib/config/configcompilercontext.cpp @@ -39,7 +39,7 @@ void ConfigCompilerContext::OpenObjectsFile(const String& filename) { m_ObjectsPath = filename; - std::fstream *fp = new std::fstream(); + auto *fp = new std::fstream(); try { m_ObjectsTempFile = Utility::CreateTempFile(filename + ".XXXXXX", 0600, *fp); } catch (const std::exception& ex) { diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 6b30bc094..0bc70f50d 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -231,7 +231,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard) String name = item_name; - NameComposer *nc = dynamic_cast(type.get()); + auto *nc = dynamic_cast(type.get()); if (nc) { if (name.IsEmpty()) diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp index 6d120a3ce..b017daafe 100644 --- a/lib/config/configitembuilder.cpp +++ b/lib/config/configitembuilder.cpp @@ -96,7 +96,7 @@ ConfigItem::Ptr ConfigItemBuilder::Compile() BOOST_THROW_EXCEPTION(ScriptError(msgbuf.str(), m_DebugInfo)); } - ConfigType *ctype = dynamic_cast(m_Type.get()); + auto *ctype = dynamic_cast(m_Type.get()); if (!ctype) { std::ostringstream msgbuf; @@ -133,7 +133,7 @@ ConfigItem::Ptr ConfigItemBuilder::Compile() } #endif /* I2_DEBUG */ - DictExpression *dexpr = new DictExpression(std::move(m_Expressions), m_DebugInfo); + auto *dexpr = new DictExpression(std::move(m_Expressions), m_DebugInfo); dexpr->MakeInline(); exprs.emplace_back(dexpr); diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp index bb7fe2248..f355509e5 100644 --- a/lib/config/expression.cpp +++ b/lib/config/expression.cpp @@ -685,7 +685,7 @@ bool IndexerExpression::GetReference(ScriptFrame& frame, bool init_dict, Value * void icinga::BindToScope(std::unique_ptr& expr, ScopeSpecifier scopeSpec) { - DictExpression *dexpr = dynamic_cast(expr.get()); + auto *dexpr = dynamic_cast(expr.get()); if (dexpr) { for (auto& expr : dexpr->m_Expressions) @@ -694,7 +694,7 @@ void icinga::BindToScope(std::unique_ptr& expr, ScopeSpecifier scope return; } - SetExpression *aexpr = dynamic_cast(expr.get()); + auto *aexpr = dynamic_cast(expr.get()); if (aexpr) { BindToScope(aexpr->m_Operand1, scopeSpec); @@ -702,21 +702,21 @@ void icinga::BindToScope(std::unique_ptr& expr, ScopeSpecifier scope return; } - IndexerExpression *iexpr = dynamic_cast(expr.get()); + auto *iexpr = dynamic_cast(expr.get()); if (iexpr) { BindToScope(iexpr->m_Operand1, scopeSpec); return; } - LiteralExpression *lexpr = dynamic_cast(expr.get()); + auto *lexpr = dynamic_cast(expr.get()); if (lexpr && lexpr->GetValue().IsString()) { std::unique_ptr scope{new GetScopeExpression(scopeSpec)}; expr.reset(new IndexerExpression(std::move(scope), std::move(expr), lexpr->GetDebugInfo())); } - VariableExpression *vexpr = dynamic_cast(expr.get()); + auto *vexpr = dynamic_cast(expr.get()); if (vexpr) { std::unique_ptr scope{new GetScopeExpression(scopeSpec)}; diff --git a/lib/config/vmops.hpp b/lib/config/vmops.hpp index 13bac82b7..4d8dd0e55 100644 --- a/lib/config/vmops.hpp +++ b/lib/config/vmops.hpp @@ -151,7 +151,7 @@ public: String checkName = name; if (!abstract) { - NameComposer *nc = dynamic_cast(type.get()); + auto *nc = dynamic_cast(type.get()); if (nc) checkName = nc->MakeName(name, nullptr); diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index ddbf76ff3..215846f2f 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -206,7 +206,7 @@ void DbConnection::UpdateProgramStatus() void DbConnection::CleanUpHandler() { - long now = static_cast(Utility::GetTime()); + auto now = static_cast(Utility::GetTime()); struct { String name; @@ -426,7 +426,7 @@ void DbConnection::UpdateObject(const ConfigObject::Ptr& object) void DbConnection::UpdateAllObjects() { for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; diff --git a/lib/db_ido/idochecktask.cpp b/lib/db_ido/idochecktask.cpp index 93d47fece..f53741a60 100644 --- a/lib/db_ido/idochecktask.cpp +++ b/lib/db_ido/idochecktask.cpp @@ -83,7 +83,7 @@ void IdoCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult return; } - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); VERIFY(dtype); DbConnection::Ptr conn = static_pointer_cast(dtype->GetObject(idoName)); diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index af337e660..fbc9ede99 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -671,7 +671,7 @@ String IdoMysqlConnection::Escape(const String& s) String utf8s = Utility::ValidateUTF8(s); size_t length = utf8s.GetLength(); - char *to = new char[utf8s.GetLength() * 2 + 1]; + auto *to = new char[utf8s.GetLength() * 2 + 1]; m_Mysql->real_escape_string(&m_Connection, to, utf8s.CStr(), length); @@ -838,7 +838,7 @@ bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& va } else if (DbValue::IsTimestampNow(value)) { *result = "NOW()"; } else if (DbValue::IsObjectInsertID(value)) { - long id = static_cast(rawvalue); + auto id = static_cast(rawvalue); if (id <= 0) return false; diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index 2a8962853..63d896aa3 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -515,7 +515,7 @@ String IdoPgsqlConnection::Escape(const String& s) String utf8s = Utility::ValidateUTF8(s); size_t length = utf8s.GetLength(); - char *to = new char[utf8s.GetLength() * 2 + 1]; + auto *to = new char[utf8s.GetLength() * 2 + 1]; m_Pgsql->escapeStringConn(m_Connection, to, utf8s.CStr(), length, nullptr); @@ -660,7 +660,7 @@ bool IdoPgsqlConnection::FieldToEscapedString(const String& key, const Value& va } else if (DbValue::IsTimestampNow(value)) { *result = "NOW()"; } else if (DbValue::IsObjectInsertID(value)) { - long id = static_cast(rawvalue); + auto id = static_cast(rawvalue); if (id <= 0) return false; diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp index ffad0cba8..2b6b50f91 100644 --- a/lib/icinga/checkable-dependency.cpp +++ b/lib/icinga/checkable-dependency.cpp @@ -74,7 +74,7 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency } /* implicit dependency on host if this is a service */ - const Service *service = dynamic_cast(this); + const auto *service = dynamic_cast(this); if (service && (dt == DependencyState || dt == DependencyNotification)) { Host::Ptr host = service->GetHost(); diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 8494e2c89..31532f73a 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -85,7 +85,7 @@ void Checkable::AddGroup(const String& name) boost::mutex::scoped_lock lock(m_CheckableMutex); Array::Ptr groups; - Host *host = dynamic_cast(this); + auto *host = dynamic_cast(this); if (host) groups = host->GetGroups(); @@ -103,7 +103,7 @@ void Checkable::AddGroup(const String& name) AcknowledgementType Checkable::GetAcknowledgement() { - AcknowledgementType avalue = static_cast(GetAcknowledgementRaw()); + auto avalue = static_cast(GetAcknowledgementRaw()); if (avalue != AcknowledgementNone) { double expiry = GetAcknowledgementExpiry(); diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 14c5e6000..c5bc72e1c 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -121,7 +121,7 @@ bool MacroProcessor::ResolveMacro(const String& macro, const ResolverList& resol } } - MacroResolver *mresolver = dynamic_cast(resolver.second.get()); + auto *mresolver = dynamic_cast(resolver.second.get()); if (mresolver && mresolver->ResolveMacro(boost::algorithm::join(tokens, "."), cr, result)) return true; diff --git a/lib/livestatus/statustable.cpp b/lib/livestatus/statustable.cpp index c7f9f9771..135e15e99 100644 --- a/lib/livestatus/statustable.cpp +++ b/lib/livestatus/statustable.cpp @@ -132,25 +132,25 @@ Value StatusTable::ConnectionsRateAccessor(const Value&) Value StatusTable::HostChecksAccessor(const Value&) { - long timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); + auto timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); return CIB::GetActiveHostChecksStatistics(timespan); } Value StatusTable::HostChecksRateAccessor(const Value&) { - long timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); + auto timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); return (CIB::GetActiveHostChecksStatistics(timespan) / (Utility::GetTime() - Application::GetStartTime())); } Value StatusTable::ServiceChecksAccessor(const Value&) { - long timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); + auto timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); return CIB::GetActiveServiceChecksStatistics(timespan); } Value StatusTable::ServiceChecksRateAccessor(const Value&) { - long timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); + auto timespan = static_cast(Utility::GetTime() - Application::GetStartTime()); return (CIB::GetActiveServiceChecksStatistics(timespan) / (Utility::GetTime() - Application::GetStartTime())); } diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp index cbb0fae3e..4fa3ea71f 100644 --- a/lib/methods/pluginnotificationtask.cpp +++ b/lib/methods/pluginnotificationtask.cpp @@ -41,7 +41,7 @@ void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification, { NotificationCommand::Ptr commandObj = notification->GetCommand(); - NotificationType type = static_cast(itype); + auto type = static_cast(itype); Checkable::Ptr checkable = notification->GetCheckable(); diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp index 4711cd9ac..c5e689f27 100644 --- a/lib/perfdata/elasticsearchwriter.cpp +++ b/lib/perfdata/elasticsearchwriter.cpp @@ -592,7 +592,7 @@ String ElasticsearchWriter::FormatTimestamp(double ts) * https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html * https://www.elastic.co/guide/en/elasticsearch/reference/current/date.html */ - int milliSeconds = static_cast((ts - static_cast(ts)) * 1000); + auto milliSeconds = static_cast((ts - static_cast(ts)) * 1000); return Utility::FormatDateTime("%Y-%m-%dT%H:%M:%S", ts) + "." + Convert::ToString(milliSeconds) + Utility::FormatDateTime("%z", ts); } diff --git a/lib/remote/apilistener-configsync.cpp b/lib/remote/apilistener-configsync.cpp index e1f5eb5ba..8107c971a 100644 --- a/lib/remote/apilistener-configsync.cpp +++ b/lib/remote/apilistener-configsync.cpp @@ -98,7 +98,7 @@ Value ApiListener::ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin double objVersion = params->Get("version"); Type::Ptr ptype = Type::GetByName(objType); - ConfigType *ctype = dynamic_cast(ptype.get()); + auto *ctype = dynamic_cast(ptype.get()); if (!ctype) { Log(LogCritical, "ApiListener") @@ -234,7 +234,7 @@ Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin /* delete the object */ Type::Ptr ptype = Type::GetByName(params->Get("type")); - ConfigType *ctype = dynamic_cast(ptype.get()); + auto *ctype = dynamic_cast(ptype.get()); if (!ctype) { Log(LogCritical, "ApiListener") @@ -414,7 +414,7 @@ void ApiListener::SendRuntimeConfigObjects(const JsonRpcConnection::Ptr& aclient << "Syncing runtime objects to endpoint '" << endpoint->GetName() << "'."; for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 0bf250050..a3051b874 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -992,7 +992,7 @@ void ApiListener::OpenLogFile() Utility::MkDirP(Utility::DirName(path), 0750); - std::fstream *fp = new std::fstream(path.CStr(), std::fstream::out | std::ofstream::app); + auto *fp = new std::fstream(path.CStr(), std::fstream::out | std::ofstream::app); if (!fp->good()) { Log(LogWarning, "ApiListener") @@ -1102,7 +1102,7 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client) Log(LogNotice, "ApiListener") << "Replaying log: " << path; - std::fstream *fp = new std::fstream(path.CStr(), std::fstream::in | std::fstream::binary); + auto *fp = new std::fstream(path.CStr(), std::fstream::in | std::fstream::binary); StdioStream::Ptr logStream = new StdioStream(fp, true); String message; diff --git a/lib/remote/authority.cpp b/lib/remote/authority.cpp index ecb24ea70..0be53b156 100644 --- a/lib/remote/authority.cpp +++ b/lib/remote/authority.cpp @@ -58,7 +58,7 @@ void ApiListener::UpdateObjectAuthority() } for (const Type::Ptr& type : Type::GetAllTypes()) { - ConfigType *dtype = dynamic_cast(type.get()); + auto *dtype = dynamic_cast(type.get()); if (!dtype) continue; diff --git a/lib/remote/configobjectutility.cpp b/lib/remote/configobjectutility.cpp index 224c70fab..5cafca9bb 100644 --- a/lib/remote/configobjectutility.cpp +++ b/lib/remote/configobjectutility.cpp @@ -55,7 +55,7 @@ String ConfigObjectUtility::EscapeName(const String& name) String ConfigObjectUtility::CreateObjectConfig(const Type::Ptr& type, const String& fullName, bool ignoreOnError, const Array::Ptr& templates, const Dictionary::Ptr& attrs) { - NameComposer *nc = dynamic_cast(type.get()); + auto *nc = dynamic_cast(type.get()); Dictionary::Ptr nameParts; String name; diff --git a/lib/remote/createobjecthandler.cpp b/lib/remote/createobjecthandler.cpp index 6decb564d..d0a846d62 100644 --- a/lib/remote/createobjecthandler.cpp +++ b/lib/remote/createobjecthandler.cpp @@ -114,7 +114,7 @@ bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r return true; } - ConfigType *ctype = dynamic_cast(type.get()); + auto *ctype = dynamic_cast(type.get()); ConfigObject::Ptr obj = ctype->GetObject(name); result1->Set("code", 200); diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp index 826e5e827..c24152d5d 100644 --- a/lib/remote/filterutility.cpp +++ b/lib/remote/filterutility.cpp @@ -47,7 +47,7 @@ Type::Ptr FilterUtility::TypeFromPluralName(const String& pluralName) void ConfigObjectTargetProvider::FindTargets(const String& type, const std::function& addTarget) const { Type::Ptr ptype = Type::GetByName(type); - ConfigType *ctype = dynamic_cast(ptype.get()); + auto *ctype = dynamic_cast(ptype.get()); if (ctype) { for (const ConfigObject::Ptr& object : ctype->GetObjects()) { diff --git a/test/base-array.cpp b/test/base-array.cpp index f199e5aa3..86be0f510 100644 --- a/test/base-array.cpp +++ b/test/base-array.cpp @@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE(remove) { ObjectLock olock(array); - Array::Iterator it = array->Begin(); + auto it = array->Begin(); array->Remove(it); } diff --git a/test/base-dictionary.cpp b/test/base-dictionary.cpp index 466892dc7..92146c879 100644 --- a/test/base-dictionary.cpp +++ b/test/base-dictionary.cpp @@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(remove) { ObjectLock olock(dictionary); - Dictionary::Iterator it = dictionary->Begin(); + auto it = dictionary->Begin(); dictionary->Remove(it); } diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index dca909ae0..10069f91b 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -289,7 +289,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) collisions = 0; for (const Field& field : klass.Fields) { - int hash = static_cast(SDBM(field.Name, hlen)); + auto hash = static_cast(SDBM(field.Name, hlen)); jumptable[hash].push_back(std::make_pair(num, field.Name)); num++; @@ -846,7 +846,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) if (field.Type.IsName || !field.TrackAccessor.empty()) { if (field.Name != "active") { - m_Impl << "\t" << "ConfigObject *dobj = dynamic_cast(this);" << std::endl + m_Impl << "\t" << "auto *dobj = dynamic_cast(this);" << std::endl << "\t" << "if (!dobj || dobj->IsActive())" << std::endl << "\t"; } @@ -1009,7 +1009,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "{" << std::endl; if (field.Name != "active") { - m_Impl << "\t" << "ConfigObject *dobj = dynamic_cast(this);" << std::endl + m_Impl << "\t" << "auto *dobj = dynamic_cast(this);" << std::endl << "\t" << "if (!dobj || dobj->IsActive())" << std::endl << "\t"; } From becfa8509409046c7f44e78bc5e1ab02812efcab Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 09:14:55 +0100 Subject: [PATCH 07/12] Apply clang-tidy fix 'modernize-use-emplace' --- icinga-studio/mainform.cpp | 4 +- lib/base/configwriter.cpp | 74 +++++++++++++++--------------- lib/base/dependencygraph.cpp | 2 +- lib/base/utility.cpp | 10 ++-- lib/config/configitem.cpp | 2 +- lib/icinga/compatutility.cpp | 14 +++--- lib/livestatus/livestatusquery.cpp | 12 ++--- lib/perfdata/influxdbwriter.cpp | 4 +- lib/remote/actionshandler.cpp | 2 +- lib/remote/apiclient.cpp | 6 +-- lib/remote/filterutility.cpp | 2 +- test/base-base64.cpp | 13 +++--- test/icinga-macros.cpp | 4 +- test/livestatus.cpp | 16 +++---- test/remote-url.cpp | 6 +-- tools/mkclass/classcompiler.cpp | 8 ++-- 16 files changed, 89 insertions(+), 90 deletions(-) diff --git a/icinga-studio/mainform.cpp b/icinga-studio/mainform.cpp index ea7218b51..64ec975db 100644 --- a/icinga-studio/mainform.cpp +++ b/icinga-studio/mainform.cpp @@ -111,7 +111,7 @@ void MainForm::OnTypeSelected(wxTreeEvent& event) ApiType::Ptr type = m_Types[typeName.ToStdString()]; std::vector attrs; - attrs.push_back("__name"); + attrs.emplace_back("__name"); m_ApiClient->GetObjects(type->PluralName, std::bind(&MainForm::ObjectsCompletionHandler, this, _1, _2, true), std::vector(), attrs); @@ -170,7 +170,7 @@ void MainForm::OnObjectSelected(wxListEvent& event) return; std::vector names; - names.push_back(objectName); + names.emplace_back(objectName); m_ApiClient->GetObjects(type->PluralName, std::bind(&MainForm::ObjectDetailsCompletionHandler, this, _1, _2, true), names, std::vector(), std::vector(), true); diff --git a/lib/base/configwriter.cpp b/lib/base/configwriter.cpp index 22fafde32..37eef9916 100644 --- a/lib/base/configwriter.cpp +++ b/lib/base/configwriter.cpp @@ -227,43 +227,43 @@ const std::vector& ConfigWriter::GetKeywords() boost::mutex::scoped_lock lock(mutex); if (keywords.empty()) { - keywords.push_back("object"); - keywords.push_back("template"); - keywords.push_back("include"); - keywords.push_back("include_recursive"); - keywords.push_back("include_zones"); - keywords.push_back("library"); - keywords.push_back("null"); - keywords.push_back("true"); - keywords.push_back("false"); - keywords.push_back("const"); - keywords.push_back("var"); - keywords.push_back("this"); - keywords.push_back("globals"); - keywords.push_back("locals"); - keywords.push_back("use"); - keywords.push_back("__using"); - keywords.push_back("default"); - keywords.push_back("ignore_on_error"); - keywords.push_back("current_filename"); - keywords.push_back("current_line"); - keywords.push_back("apply"); - keywords.push_back("to"); - keywords.push_back("where"); - keywords.push_back("import"); - keywords.push_back("assign"); - keywords.push_back("ignore"); - keywords.push_back("function"); - keywords.push_back("return"); - keywords.push_back("break"); - keywords.push_back("continue"); - keywords.push_back("for"); - keywords.push_back("if"); - keywords.push_back("else"); - keywords.push_back("while"); - keywords.push_back("throw"); - keywords.push_back("try"); - keywords.push_back("except"); + keywords.emplace_back("object"); + keywords.emplace_back("template"); + keywords.emplace_back("include"); + keywords.emplace_back("include_recursive"); + keywords.emplace_back("include_zones"); + keywords.emplace_back("library"); + keywords.emplace_back("null"); + keywords.emplace_back("true"); + keywords.emplace_back("false"); + keywords.emplace_back("const"); + keywords.emplace_back("var"); + keywords.emplace_back("this"); + keywords.emplace_back("globals"); + keywords.emplace_back("locals"); + keywords.emplace_back("use"); + keywords.emplace_back("__using"); + keywords.emplace_back("default"); + keywords.emplace_back("ignore_on_error"); + keywords.emplace_back("current_filename"); + keywords.emplace_back("current_line"); + keywords.emplace_back("apply"); + keywords.emplace_back("to"); + keywords.emplace_back("where"); + keywords.emplace_back("import"); + keywords.emplace_back("assign"); + keywords.emplace_back("ignore"); + keywords.emplace_back("function"); + keywords.emplace_back("return"); + keywords.emplace_back("break"); + keywords.emplace_back("continue"); + keywords.emplace_back("for"); + keywords.emplace_back("if"); + keywords.emplace_back("else"); + keywords.emplace_back("while"); + keywords.emplace_back("throw"); + keywords.emplace_back("try"); + keywords.emplace_back("except"); } return keywords; diff --git a/lib/base/dependencygraph.cpp b/lib/base/dependencygraph.cpp index df686470c..8fccef5f3 100644 --- a/lib/base/dependencygraph.cpp +++ b/lib/base/dependencygraph.cpp @@ -59,7 +59,7 @@ std::vector DependencyGraph::GetParents(const Object::Ptr& child) if (it != m_Dependencies.end()) { typedef std::pair kv_pair; for (const kv_pair& kv : it->second) { - objects.push_back(kv.first); + objects.emplace_back(kv.first); } } diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index adf5a7bcd..edbf2e468 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -580,9 +580,9 @@ bool Utility::Glob(const String& pathSpec, const std::function= 1) tokens.emplace_back(Convert::ToString(milliseconds) + (milliseconds != 1 ? " milliseconds" : " millisecond")); else - tokens.push_back("less than 1 millisecond"); + tokens.emplace_back("less than 1 millisecond"); } return NaturalJoin(tokens); @@ -1254,10 +1254,10 @@ int Utility::CompareVersion(const String& v1, const String& v2) boost::algorithm::split(tokensv2, v2, boost::is_any_of(".")); for (std::vector::size_type i = 0; i < tokensv2.size() - tokensv1.size(); i++) - tokensv1.push_back("0"); + tokensv1.emplace_back("0"); for (std::vector::size_type i = 0; i < tokensv1.size() - tokensv2.size(); i++) - tokensv2.push_back("0"); + tokensv2.emplace_back("0"); for (std::vector::size_type i = 0; i < tokensv1.size(); i++) { if (Convert::ToLong(tokensv2[i]) > Convert::ToLong(tokensv1[i])) diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 0bc70f50d..87037e92f 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -327,7 +327,7 @@ void ConfigItem::Register() /* If this is a non-abstract object with a composite name * we register it in m_UnnamedItems instead of m_Items. */ if (!m_Abstract && dynamic_cast(m_Type.get())) - m_UnnamedItems.push_back(this); + m_UnnamedItems.emplace_back(this); else { auto& items = m_Items[m_Type]; diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp index 3139e0d52..29eef3dd5 100644 --- a/lib/icinga/compatutility.cpp +++ b/lib/icinga/compatutility.cpp @@ -457,32 +457,32 @@ String CompatUtility::GetCheckableNotificationNotificationOptions(const Checkabl /* notification state filters */ if (service) { if (notification_state_filter & ServiceWarning) { - notification_options.push_back("w"); + notification_options.emplace_back("w"); } if (notification_state_filter & ServiceUnknown) { - notification_options.push_back("u"); + notification_options.emplace_back("u"); } if (notification_state_filter & ServiceCritical) { - notification_options.push_back("c"); + notification_options.emplace_back("c"); } } else { if (notification_state_filter & HostDown) { - notification_options.push_back("d"); + notification_options.emplace_back("d"); } } /* notification type filters */ if (notification_type_filter & NotificationRecovery) { - notification_options.push_back("r"); + notification_options.emplace_back("r"); } if ((notification_type_filter & NotificationFlappingStart) || (notification_type_filter & NotificationFlappingEnd)) { - notification_options.push_back("f"); + notification_options.emplace_back("f"); } if ((notification_type_filter & NotificationDowntimeStart) || (notification_type_filter & NotificationDowntimeEnd) || (notification_type_filter & NotificationDowntimeRemoved)) { - notification_options.push_back("s"); + notification_options.emplace_back("s"); } return boost::algorithm::join(notification_options, ","); diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp index ab33f8638..a8e7577aa 100644 --- a/lib/livestatus/livestatusquery.cpp +++ b/lib/livestatus/livestatusquery.cpp @@ -71,10 +71,10 @@ LivestatusQuery::LivestatusQuery(const std::vector& lines, const String& m_CompatLogPath = compat_log_path; /* default separators */ - m_Separators.push_back("\n"); - m_Separators.push_back(";"); - m_Separators.push_back(","); - m_Separators.push_back("|"); + m_Separators.emplace_back("\n"); + m_Separators.emplace_back(";"); + m_Separators.emplace_back(","); + m_Separators.emplace_back("|"); String line = lines[0]; @@ -233,7 +233,7 @@ LivestatusQuery::LivestatusQuery(const std::vector& lines, const String& aggregators.pop_back(); } - deq.push_back(filter); + deq.emplace_back(filter); if (&deq == &stats) { Aggregator::Ptr aggregator = new CountAggregator(); aggregator->SetFilter(filter); @@ -317,7 +317,7 @@ Filter::Ptr LivestatusQuery::ParseFilter(const String& params, unsigned long& fr tokens.emplace_back(std::move(temp_buffer)); if (tokens.size() == 2) - tokens.push_back(""); + tokens.emplace_back(""); if (tokens.size() < 3) return nullptr; diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp index 5c4913818..3121d2ab9 100644 --- a/lib/perfdata/influxdbwriter.cpp +++ b/lib/perfdata/influxdbwriter.cpp @@ -373,7 +373,7 @@ void InfluxdbWriter::SendMetric(const Dictionary::Ptr& tmpl, const String& label #endif /* I2_DEBUG */ // Buffer the data point - m_DataBuffer.push_back(msgbuf.str()); + m_DataBuffer.emplace_back(msgbuf.str()); // Flush if we've buffered too much to prevent excessive memory use if (static_cast(m_DataBuffer.size()) >= GetFlushThreshold()) { @@ -423,7 +423,7 @@ void InfluxdbWriter::Flush() url->SetPort(GetPort()); std::vector path; - path.push_back("write"); + path.emplace_back("write"); url->SetPath(path); url->AddQueryElement("db", GetDatabase()); diff --git a/lib/remote/actionshandler.cpp b/lib/remote/actionshandler.cpp index fff051e06..8ddeb7a16 100644 --- a/lib/remote/actionshandler.cpp +++ b/lib/remote/actionshandler.cpp @@ -69,7 +69,7 @@ bool ActionsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& reques } } else { FilterUtility::CheckPermission(user, permission); - objs.push_back(nullptr); + objs.emplace_back(nullptr); } Array::Ptr results = new Array(); diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp index 4b43d5ebc..e5a98fceb 100644 --- a/lib/remote/apiclient.cpp +++ b/lib/remote/apiclient.cpp @@ -122,7 +122,7 @@ void ApiClient::GetObjects(const String& pluralType, const ObjectsCompletionCall params["joins"].push_back(join); } - params["all_joins"].push_back(all_joins ? "1" : "0"); + params["all_joins"].emplace_back(all_joins ? "1" : "0"); url->SetQuery(params); @@ -232,7 +232,7 @@ void ApiClient::ExecuteScript(const String& session, const String& command, bool std::map > params; params["session"].push_back(session); params["command"].push_back(command); - params["sandboxed"].push_back(sandboxed ? "1" : "0"); + params["sandboxed"].emplace_back(sandboxed ? "1" : "0"); url->SetQuery(params); try { @@ -311,7 +311,7 @@ void ApiClient::AutocompleteScript(const String& session, const String& command, std::map > params; params["session"].push_back(session); params["command"].push_back(command); - params["sandboxed"].push_back(sandboxed ? "1" : "0"); + params["sandboxed"].emplace_back(sandboxed ? "1" : "0"); url->SetQuery(params); try { diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp index c24152d5d..fe3d03bda 100644 --- a/lib/remote/filterutility.cpp +++ b/lib/remote/filterutility.cpp @@ -127,7 +127,7 @@ static void FilteredAddTarget(ScriptFrame& permissionFrame, Expression *permissi ScriptFrame& frame, Expression *ufilter, std::vector& result, const String& variableName, const Object::Ptr& target) { if (FilterUtility::EvaluateFilter(permissionFrame, permissionFilter, target, variableName) && FilterUtility::EvaluateFilter(frame, ufilter, target, variableName)) - result.push_back(target); + result.emplace_back(target); } void FilterUtility::CheckPermission(const ApiUser::Ptr& user, const String& permission, Expression **permissionFilter) diff --git a/test/base-base64.cpp b/test/base-base64.cpp index 1426fc747..eb9c2af01 100644 --- a/test/base-base64.cpp +++ b/test/base-base64.cpp @@ -27,13 +27,12 @@ BOOST_AUTO_TEST_SUITE(base_base64) BOOST_AUTO_TEST_CASE(base64) { std::vector clearText; - clearText.push_back(""); - clearText.push_back("1"); - clearText.push_back("12"); - clearText.push_back("123"); - clearText.push_back("1234"); - clearText.push_back( - "VsowLvPqEiAeITDmo-5L_NB-k7fsT3sT2d3K9O4iC2uBk41hvCPAxrgGSxrdeX5s" + clearText.emplace_back(""); + clearText.emplace_back("1"); + clearText.emplace_back("12"); + clearText.emplace_back("123"); + clearText.emplace_back("1234"); + clearText.emplace_back("VsowLvPqEiAeITDmo-5L_NB-k7fsT3sT2d3K9O4iC2uBk41hvCPAxrgGSxrdeX5s" "Zo0Z9b1kxDZlzf8GHQ9ARW6YLeGODMtiZo8cKkUzfSbxyZ_wlE9u6pCTTg9kODCM" "Ve-X_a3jWkOy89RoDkT5ahKBY-8S25L6wlvWt8ZyQ2bLxfplzEzuHgEknTMKKp2K" "jRlwI2p3gF4FYeQM7dx0E5O782Lh1P3IC6jPNqiZgTgWmsRYZbAN8oU2V626bQxD" diff --git a/test/icinga-macros.cpp b/test/icinga-macros.cpp index 420bff993..94f067600 100644 --- a/test/icinga-macros.cpp +++ b/test/icinga-macros.cpp @@ -41,8 +41,8 @@ BOOST_AUTO_TEST_CASE(simple) macrosB->Set("testD", testD); MacroProcessor::ResolverList resolvers; - resolvers.push_back(std::make_pair("macrosA", macrosA)); - resolvers.push_back(std::make_pair("macrosB", macrosB)); + resolvers.emplace_back("macrosA", macrosA); + resolvers.emplace_back("macrosB", macrosB); BOOST_CHECK(MacroProcessor::ResolveMacros("$macrosA.testB$ $macrosB.testC$", resolvers) == "hello world"); BOOST_CHECK(MacroProcessor::ResolveMacros("$testA$", resolvers) == "7"); diff --git a/test/livestatus.cpp b/test/livestatus.cpp index 11f45c23c..bb74ffc30 100644 --- a/test/livestatus.cpp +++ b/test/livestatus.cpp @@ -67,10 +67,10 @@ BOOST_AUTO_TEST_CASE(hosts) BOOST_TEST_MESSAGE( "Querying Livestatus..."); std::vector lines; - lines.push_back("GET hosts"); - lines.push_back("Columns: host_name address check_command"); - lines.push_back("OutputFormat: json"); - lines.push_back("\n"); + lines.emplace_back("GET hosts"); + lines.emplace_back("Columns: host_name address check_command"); + lines.emplace_back("OutputFormat: json"); + lines.emplace_back("\n"); /* use our query helper */ String output = LivestatusQueryHelper(lines); @@ -97,10 +97,10 @@ BOOST_AUTO_TEST_CASE(services) BOOST_TEST_MESSAGE( "Querying Livestatus..."); std::vector lines; - lines.push_back("GET services"); - lines.push_back("Columns: host_name service_description check_command notes"); - lines.push_back("OutputFormat: json"); - lines.push_back("\n"); + lines.emplace_back("GET services"); + lines.emplace_back("Columns: host_name service_description check_command notes"); + lines.emplace_back("OutputFormat: json"); + lines.emplace_back("\n"); /* use our query helper */ String output = LivestatusQueryHelper(lines); diff --git a/test/remote-url.cpp b/test/remote-url.cpp index 92344b44e..d70751872 100644 --- a/test/remote-url.cpp +++ b/test/remote-url.cpp @@ -34,9 +34,9 @@ BOOST_AUTO_TEST_CASE(id_and_path) BOOST_CHECK(url->GetAuthority() == "icinga.com"); std::vector PathCorrect; - PathCorrect.push_back("foo"); - PathCorrect.push_back("bar"); - PathCorrect.push_back("baz"); + PathCorrect.emplace_back("foo"); + PathCorrect.emplace_back("bar"); + PathCorrect.emplace_back("baz"); BOOST_CHECK(url->GetPath() == PathCorrect); } diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 10069f91b..23d3ce1f6 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -290,7 +290,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) for (const Field& field : klass.Fields) { auto hash = static_cast(SDBM(field.Name, hlen)); - jumptable[hash].push_back(std::make_pair(num, field.Name)); + jumptable[hash].emplace_back(num, field.Name); num++; if (jumptable[hash].size() > 1) @@ -403,7 +403,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "\t" << "std::vector deps;" << std::endl; for (const std::string& dep : klass.LoadDependencies) - m_Impl << "\t" << "deps.push_back(\"" << dep << "\");" << std::endl; + m_Impl << "\t" << "deps.emplace_back(\"" << dep << "\");" << std::endl; m_Impl << "\t" << "return deps;" << std::endl << "}" << std::endl << std::endl; @@ -1208,7 +1208,7 @@ void ClassCompiler::CodeGenValidator(const std::string& name, const std::string& else subvalidator_prefix = name; - m_Impl << (type_check ? "\t" : "") << (indent ? "\t\t" : "") << "\t\t" << "location.push_back(akey);" << std::endl + m_Impl << (type_check ? "\t" : "") << (indent ? "\t\t" : "") << "\t\t" << "location.emplace_back(akey);" << std::endl << (type_check ? "\t" : "") << (indent ? "\t\t" : "") << "\t\t" << "TIValidate" << subvalidator_prefix << "_" << i << "(object, akey, avalue, location, utils);" << std::endl << (type_check ? "\t" : "") << (indent ? "\t\t" : "") << "\t\t" << "location.pop_back();" << std::endl; @@ -1313,7 +1313,7 @@ void ClassCompiler::HandleValidator(const Validator& validator, const ClassDebug << "{" << std::endl << "\t" << "SimpleValidate" << it.first.second << "(value, utils);" << std::endl << "\t" << "std::vector location;" << std::endl - << "\t" << "location.push_back(\"" << it.second.Name << "\");" << std::endl + << "\t" << "location.emplace_back(\"" << it.second.Name << "\");" << std::endl << "\t" << "TIValidate" << it.first.first << it.first.second << "(this, value, location, utils);" << std::endl << "\t" << "location.pop_back();" << std::endl << "}" << std::endl << std::endl; From e0c350b8a5ea1d682fa991c78c17e6f9f634dff2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 09:18:50 +0100 Subject: [PATCH 08/12] Apply clang-tidy fix 'modernize-use-nullptr' --- icinga-studio/forms.cpp | 8 ++++---- lib/base/exception.cpp | 2 +- lib/base/object.cpp | 5 +---- lib/base/tlsutility.cpp | 2 +- lib/base/utility.cpp | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/icinga-studio/forms.cpp b/icinga-studio/forms.cpp index 2cf189e22..afe31d6d0 100644 --- a/icinga-studio/forms.cpp +++ b/icinga-studio/forms.cpp @@ -68,8 +68,8 @@ MainFormBase::MainFormBase( wxWindow* parent, wxWindowID id, const wxString& tit // Connect Events this->Connect( m_QuitMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFormBase::OnQuitClicked ) ); this->Connect( m_AboutMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFormBase::OnAboutClicked ) ); - m_TypesTree->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( MainFormBase::OnTypeSelected ), NULL, this ); - m_ObjectsList->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFormBase::OnObjectSelected ), NULL, this ); + m_TypesTree->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( MainFormBase::OnTypeSelected ), nullptr, this ); + m_ObjectsList->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFormBase::OnObjectSelected ), nullptr, this ); } MainFormBase::~MainFormBase() @@ -77,8 +77,8 @@ MainFormBase::~MainFormBase() // Disconnect Events this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFormBase::OnQuitClicked ) ); this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFormBase::OnAboutClicked ) ); - m_TypesTree->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( MainFormBase::OnTypeSelected ), NULL, this ); - m_ObjectsList->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFormBase::OnObjectSelected ), NULL, this ); + m_TypesTree->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( MainFormBase::OnTypeSelected ), nullptr, this ); + m_ObjectsList->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFormBase::OnObjectSelected ), nullptr, this ); } diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 46927d66e..663ec3433 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -115,7 +115,7 @@ void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *)) l_LastExceptionDest.reset(new DestCallback(dest)); #endif /* !defined(__GLIBCXX__) && !defined(_WIN32) */ - if (real_cxa_throw == 0) + if (real_cxa_throw == nullptr) real_cxa_throw = (cxa_throw_fn)dlsym(RTLD_NEXT, "__cxa_throw"); #ifndef NO_CAST_EXCEPTION diff --git a/lib/base/object.cpp b/lib/base/object.cpp index 46e37072b..b8288c11a 100644 --- a/lib/base/object.cpp +++ b/lib/base/object.cpp @@ -43,9 +43,6 @@ static Timer::Ptr l_ObjectCountTimer; */ Object::Object() : m_References(0), m_Mutex(0) -#ifdef I2_DEBUG - , m_LockOwner(0) -#endif /* I2_DEBUG */ { } /** @@ -77,7 +74,7 @@ bool Object::OwnsLock() const return (tid == GetCurrentThreadId()); #else /* _WIN32 */ - pthread_t tid = __sync_fetch_and_add(&m_LockOwner, 0); + pthread_t tid = __sync_fetch_and_add(&m_LockOwner, nullptr); return (tid == pthread_self()); #endif /* _WIN32 */ diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp index 4746d8e83..4adf04f33 100644 --- a/lib/base/tlsutility.cpp +++ b/lib/base/tlsutility.cpp @@ -379,7 +379,7 @@ int MakeX509CSR(const String& cn, const String& keyfile, const String& csrfile, << boost::errinfo_file_name(keyfile)); } - if (!PEM_write_bio_PrivateKey(bio, key, nullptr, nullptr, 0, 0, nullptr)) { + if (!PEM_write_bio_PrivateKey(bio, key, nullptr, nullptr, 0, nullptr, nullptr)) { EVP_PKEY_free(key); EC_KEY_free(eckey); BIO_free(bio); diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index edbf2e468..0171ac4a5 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -84,7 +84,7 @@ String Utility::DemangleSymbolName(const String& sym) #ifdef HAVE_CXXABI_H int status; - char *realname = abi::__cxa_demangle(sym.CStr(), 0, 0, &status); + char *realname = abi::__cxa_demangle(sym.CStr(), nullptr, nullptr, &status); if (realname) { result = String(realname); From e0174b8f3fc0b85e9af42db79df8306205cc132d Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 09:28:24 +0100 Subject: [PATCH 09/12] Apply clang-tidy fix 'modernize-return-braced-init-list' --- lib/base/objecttype.cpp | 2 +- lib/base/type.cpp | 2 +- lib/db_ido/dbconnection.cpp | 4 ++-- lib/db_ido_mysql/idomysqlconnection.cpp | 2 +- lib/db_ido_pgsql/idopgsqlconnection.cpp | 2 +- tools/mkclass/classcompiler.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/base/objecttype.cpp b/lib/base/objecttype.cpp index f61f4f0ba..48521a439 100644 --- a/lib/base/objecttype.cpp +++ b/lib/base/objecttype.cpp @@ -58,7 +58,7 @@ int ObjectType::GetFieldId(const String& name) const Field ObjectType::GetFieldInfo(int id) const { if (id == 0) - return Field(1, "String", "type", nullptr, nullptr, 0, 0); + return {1, "String", "type", nullptr, nullptr, 0, 0}; else BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID.")); } diff --git a/lib/base/type.cpp b/lib/base/type.cpp index 2d8a3fa80..e4918e9b9 100644 --- a/lib/base/type.cpp +++ b/lib/base/type.cpp @@ -201,7 +201,7 @@ Field TypeType::GetFieldInfo(int id) const return GetBaseType()->GetFieldInfo(id); if (real_id == 0) - return Field(0, "String", "name", "", nullptr, 0, 0); + return {0, "String", "name", "", nullptr, 0, 0}; else if (real_id == 1) return Field(1, "Object", "prototype", "", nullptr, 0, 0); else if (real_id == 2) diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index 215846f2f..496b65614 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -296,7 +296,7 @@ DbReference DbConnection::GetObjectID(const DbObject::Ptr& dbobj) const auto it = m_ObjectIDs.find(dbobj); if (it == m_ObjectIDs.end()) - return DbReference(); + return {}; return it->second; } @@ -325,7 +325,7 @@ DbReference DbConnection::GetInsertID(const DbObject::Ptr& dbobj) const DbReference DbConnection::GetInsertID(const DbType::Ptr& type, const DbReference& objid) const { if (!objid.IsValid()) - return DbReference(); + return {}; auto it = m_InsertIDs.find(std::make_pair(type, objid)); diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index fbc9ede99..28b60e0dc 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -654,7 +654,7 @@ DbReference IdoMysqlConnection::GetLastInsertID() { AssertOnWorkQueue(); - return DbReference(m_Mysql->insert_id(&m_Connection)); + return {m_Mysql->insert_id(&m_Connection)}; } int IdoMysqlConnection::GetAffectedRows() diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index 63d896aa3..e4da2c151 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -498,7 +498,7 @@ DbReference IdoPgsqlConnection::GetSequenceValue(const String& table, const Stri Log(LogDebug, "IdoPgsqlConnection") << "Sequence Value: " << row->Get("id"); - return DbReference(Convert::ToLong(row->Get("id"))); + return {Convert::ToLong(row->Get("id"))}; } int IdoPgsqlConnection::GetAffectedRows() diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 23d3ce1f6..9b5978db9 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -359,7 +359,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) nameref = "nullptr"; m_Impl << "\t\t" << "case " << num << ":" << std::endl - << "\t\t\t" << "return Field(" << num << ", \"" << ftype << "\", \"" << field.Name << "\", \"" << (field.NavigationName.empty() ? field.Name : field.NavigationName) << "\", " << nameref << ", " << field.Attributes << ", " << field.Type.ArrayRank << ");" << std::endl; + << "\t\t\t" << "return {" << num << ", \"" << ftype << "\", \"" << field.Name << "\", \"" << (field.NavigationName.empty() ? field.Name : field.NavigationName) << "\", " << nameref << ", " << field.Attributes << ", " << field.Type.ArrayRank << "};" << std::endl; num++; } From 91c256261af6d6e722a67cbab744c48bc674b4e4 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 09:43:49 +0100 Subject: [PATCH 10/12] Apply clang-tidy fix 'modernize-use-default-member-init' --- lib/base/array.cpp | 6 ------ lib/base/array.hpp | 4 +--- lib/base/configobject.cpp | 3 --- lib/base/configobject.hpp | 3 --- lib/base/debuginfo.cpp | 4 ---- lib/base/debuginfo.hpp | 10 ++++------ lib/base/dictionary.cpp | 6 ------ lib/base/dictionary.hpp | 4 ---- lib/base/exception.cpp | 7 ------- lib/base/exception.hpp | 5 ++--- lib/base/fifo.cpp | 7 ------- lib/base/fifo.hpp | 9 ++++----- lib/base/json.cpp | 6 +----- lib/base/object.cpp | 7 ------- lib/base/object.hpp | 10 +++++----- lib/base/objectlock.cpp | 4 ---- lib/base/objectlock.hpp | 5 ++--- lib/base/objecttype.cpp | 3 --- lib/base/objecttype.hpp | 2 -- lib/base/perfdatavalue.hpp | 2 +- lib/base/socket.cpp | 8 -------- lib/base/socket.hpp | 4 ++-- lib/base/socketevents.hpp | 10 +++------- lib/base/stream.hpp | 12 ++++-------- lib/base/streamlogger.cpp | 7 ------- lib/base/streamlogger.hpp | 6 ++---- lib/base/string.cpp | 7 ------- lib/base/string.hpp | 4 +--- lib/base/threadpool.cpp | 2 +- lib/base/threadpool.hpp | 26 +++++++++++-------------- lib/base/timer.cpp | 7 ------- lib/base/timer.hpp | 9 ++++----- lib/base/type.cpp | 6 ------ lib/base/type.hpp | 3 --- lib/base/value.cpp | 6 ------ lib/base/value.hpp | 4 +--- lib/base/workqueue.cpp | 4 ++-- lib/base/workqueue.hpp | 22 ++++++++++----------- lib/checker/checkercomponent.cpp | 4 ---- lib/checker/checkercomponent.hpp | 4 +--- lib/config/configcompilercontext.cpp | 4 ---- lib/config/configcompilercontext.hpp | 4 +--- lib/config/configitembuilder.cpp | 9 --------- lib/config/configitembuilder.hpp | 8 ++++---- lib/config/expression.hpp | 4 ++-- lib/db_ido/dbconnection.cpp | 4 ---- lib/db_ido/dbconnection.hpp | 8 +++----- lib/db_ido/dbquery.hpp | 14 +++++-------- lib/db_ido/dbreference.cpp | 4 ---- lib/db_ido/dbreference.hpp | 4 ++-- lib/db_ido_mysql/idomysqlconnection.cpp | 6 +----- lib/db_ido_mysql/idomysqlconnection.hpp | 4 +--- lib/db_ido_pgsql/idopgsqlconnection.cpp | 1 - lib/db_ido_pgsql/idopgsqlconnection.hpp | 2 +- lib/icinga/checkable.cpp | 1 - lib/icinga/checkable.hpp | 2 +- lib/icinga/macroprocessor.cpp | 12 ++++-------- lib/livestatus/aggregator.cpp | 3 --- lib/livestatus/aggregator.hpp | 2 +- lib/livestatus/andfilter.cpp | 3 --- lib/livestatus/andfilter.hpp | 2 -- lib/livestatus/avgaggregator.hpp | 8 ++------ lib/livestatus/combinerfilter.cpp | 3 --- lib/livestatus/combinerfilter.hpp | 2 +- lib/livestatus/countaggregator.hpp | 6 +----- lib/livestatus/invavgaggregator.hpp | 8 ++------ lib/livestatus/invsumaggregator.hpp | 6 +----- lib/livestatus/maxaggregator.hpp | 6 +----- lib/livestatus/minaggregator.hpp | 6 +----- lib/livestatus/orfilter.cpp | 3 --- lib/livestatus/orfilter.hpp | 2 -- lib/livestatus/stdaggregator.hpp | 10 +++------- lib/livestatus/sumaggregator.hpp | 6 +----- lib/perfdata/elasticsearchwriter.cpp | 4 ---- lib/perfdata/elasticsearchwriter.hpp | 4 +--- lib/perfdata/gelfwriter.cpp | 4 ---- lib/perfdata/gelfwriter.hpp | 4 +--- lib/perfdata/graphitewriter.cpp | 4 ---- lib/perfdata/graphitewriter.hpp | 4 +--- lib/perfdata/influxdbwriter.cpp | 4 ---- lib/perfdata/influxdbwriter.hpp | 4 +--- lib/remote/apilistener.cpp | 1 - lib/remote/apilistener.hpp | 4 ++-- lib/remote/consolehandler.hpp | 8 ++------ lib/remote/endpoint.cpp | 4 ---- lib/remote/endpoint.hpp | 10 ++++------ lib/remote/url.cpp | 3 --- lib/remote/url.hpp | 2 +- tools/mkclass/classcompiler.hpp | 20 ++++++------------- 89 files changed, 120 insertions(+), 393 deletions(-) diff --git a/lib/base/array.cpp b/lib/base/array.cpp index dad3d39bc..2a00d3b29 100644 --- a/lib/base/array.cpp +++ b/lib/base/array.cpp @@ -32,16 +32,10 @@ template class std::vector; REGISTER_PRIMITIVE_TYPE(Array, Object, Array::GetPrototype()); -Array::Array() -{ } - Array::Array(std::initializer_list init) : m_Data(init) { } -Array::~Array() -{ } - /** * Restrieves a value from an array. * diff --git a/lib/base/array.hpp b/lib/base/array.hpp index c14d95c5e..36f4f62f9 100644 --- a/lib/base/array.hpp +++ b/lib/base/array.hpp @@ -47,11 +47,9 @@ public: typedef std::vector::size_type SizeType; - Array(); + Array() = default; Array(std::initializer_list init); - ~Array() override; - Value Get(SizeType index) const; void Set(SizeType index, const Value& value); void Set(SizeType index, Value&& value); diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index a4370d6df..d725afe92 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -46,9 +46,6 @@ REGISTER_TYPE_WITH_PROTOTYPE(ConfigObject, ConfigObject::GetPrototype()); boost::signals2::signal ConfigObject::OnStateChanged; -ConfigObject::ConfigObject() -{ } - bool ConfigObject::IsActive() const { return GetActive(); diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp index 8ff068fc5..013f603dd 100644 --- a/lib/base/configobject.hpp +++ b/lib/base/configobject.hpp @@ -96,9 +96,6 @@ public: static Object::Ptr GetPrototype(); -protected: - explicit ConfigObject(); - private: ConfigObject::Ptr m_Zone; diff --git a/lib/base/debuginfo.cpp b/lib/base/debuginfo.cpp index 944505dd2..3071e20c9 100644 --- a/lib/base/debuginfo.cpp +++ b/lib/base/debuginfo.cpp @@ -23,10 +23,6 @@ using namespace icinga; -DebugInfo::DebugInfo() - : FirstLine(0), FirstColumn(0), LastLine(0), LastColumn(0) -{ } - /** * Outputs a DebugInfo struct to a stream. * diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp index 0419c4897..836069e47 100644 --- a/lib/base/debuginfo.hpp +++ b/lib/base/debuginfo.hpp @@ -35,13 +35,11 @@ struct DebugInfo { String Path; - int FirstLine; - int FirstColumn; + int FirstLine{0}; + int FirstColumn{0}; - int LastLine; - int LastColumn; - - DebugInfo(); + int LastLine{0}; + int LastColumn{0}; }; std::ostream& operator<<(std::ostream& out, const DebugInfo& val); diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp index 6726150c0..da80220b1 100644 --- a/lib/base/dictionary.cpp +++ b/lib/base/dictionary.cpp @@ -29,12 +29,6 @@ template class std::map; REGISTER_PRIMITIVE_TYPE(Dictionary, Object, Dictionary::GetPrototype()); -Dictionary::Dictionary() -{ } - -Dictionary::~Dictionary() -{ } - /** * Retrieves a value from a dictionary. * diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp index 26c7c6a23..c1bd42c6f 100644 --- a/lib/base/dictionary.hpp +++ b/lib/base/dictionary.hpp @@ -49,10 +49,6 @@ public: typedef std::map::value_type Pair; - Dictionary(); - - ~Dictionary() override; - Value Get(const String& key) const; bool Get(const String& key, Value *result) const; void Set(const String& key, Value value); diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 663ec3433..5d7f901b7 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -291,9 +291,6 @@ ScriptError::ScriptError(String message, DebugInfo di, bool incompleteExpr) : m_Message(std::move(message)), m_DebugInfo(std::move(di)), m_IncompleteExpr(incompleteExpr), m_HandledByDebugger(false) { } -ScriptError::~ScriptError() throw() -{ } - const char *ScriptError::what() const throw() { return m_Message.CStr(); @@ -319,10 +316,6 @@ void ScriptError::SetHandledByDebugger(bool handled) m_HandledByDebugger = handled; } -posix_error::posix_error() - : m_Message(nullptr) -{ } - posix_error::~posix_error() throw() { free(m_Message); diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index 208ac1d53..df41d4523 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -53,7 +53,7 @@ class ScriptError : virtual public user_error public: ScriptError(String message); ScriptError(String message, DebugInfo di, bool incompleteExpr = false); - ~ScriptError() throw() override; + ~ScriptError() throw() = default; const char *what(void) const throw() final; @@ -125,13 +125,12 @@ String DiagnosticInformation(const boost::exception_ptr& eptr, bool verbose = tr class posix_error : virtual public std::exception, virtual public boost::exception { public: - posix_error(); ~posix_error() throw() override; const char *what(void) const throw() final; private: - mutable char *m_Message; + mutable char *m_Message{nullptr}; }; #ifdef _WIN32 diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp index e4912ce78..e0d295791 100644 --- a/lib/base/fifo.cpp +++ b/lib/base/fifo.cpp @@ -21,13 +21,6 @@ using namespace icinga; -/** - * Constructor for the FIFO class. - */ -FIFO::FIFO() - : m_Buffer(nullptr), m_DataSize(0), m_AllocSize(0), m_Offset(0) -{ } - /** * Destructor for the FIFO class. */ diff --git a/lib/base/fifo.hpp b/lib/base/fifo.hpp index 6efc87060..6b85a2842 100644 --- a/lib/base/fifo.hpp +++ b/lib/base/fifo.hpp @@ -38,7 +38,6 @@ public: static const size_t BlockSize = 512; - FIFO(); ~FIFO() override; size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; @@ -52,10 +51,10 @@ public: size_t GetAvailableBytes() const; private: - char *m_Buffer; - size_t m_DataSize; - size_t m_AllocSize; - size_t m_Offset; + char *m_Buffer{nullptr}; + size_t m_DataSize{0}; + size_t m_AllocSize{0}; + size_t m_Offset{0}; void ResizeBuffer(size_t newSize, bool decrease); void Optimize(); diff --git a/lib/base/json.cpp b/lib/base/json.cpp index 0f4f5453e..ff9f04c49 100644 --- a/lib/base/json.cpp +++ b/lib/base/json.cpp @@ -126,12 +126,8 @@ String icinga::JsonEncode(const Value& value, bool pretty_print) struct JsonElement { String Key; - bool KeySet; + bool KeySet{false}; Value EValue; - - JsonElement() - : KeySet(false) - { } }; struct JsonContext diff --git a/lib/base/object.cpp b/lib/base/object.cpp index b8288c11a..add244396 100644 --- a/lib/base/object.cpp +++ b/lib/base/object.cpp @@ -38,13 +38,6 @@ static std::map l_ObjectCounts; static Timer::Ptr l_ObjectCountTimer; #endif /* I2_LEAK_DEBUG */ -/** - * Default constructor for the Object class. - */ -Object::Object() - : m_References(0), m_Mutex(0) -{ } - /** * Destructor for the Object class. */ diff --git a/lib/base/object.hpp b/lib/base/object.hpp index 6ebf66de6..40eae3431 100644 --- a/lib/base/object.hpp +++ b/lib/base/object.hpp @@ -109,7 +109,7 @@ class Object public: DECLARE_PTR_TYPEDEFS(Object); - Object(); + Object() = default; virtual ~Object(); virtual String ToString() const; @@ -139,11 +139,11 @@ public: static intrusive_ptr TypeInstance; private: - Object(const Object& other); - Object& operator=(const Object& rhs); + Object(const Object& other) = delete; + Object& operator=(const Object& rhs) = delete; - uintptr_t m_References; - mutable uintptr_t m_Mutex; + uintptr_t m_References{0}; + mutable uintptr_t m_Mutex{0}; #ifdef I2_DEBUG # ifndef _WIN32 diff --git a/lib/base/objectlock.cpp b/lib/base/objectlock.cpp index a1b4a8ae6..2abb43fba 100644 --- a/lib/base/objectlock.cpp +++ b/lib/base/objectlock.cpp @@ -25,10 +25,6 @@ using namespace icinga; #define I2MUTEX_UNLOCKED 0 #define I2MUTEX_LOCKED 1 -ObjectLock::ObjectLock() - : m_Object(nullptr), m_Locked(false) -{ } - ObjectLock::~ObjectLock() { Unlock(); diff --git a/lib/base/objectlock.hpp b/lib/base/objectlock.hpp index 469419770..1c2f993e8 100644 --- a/lib/base/objectlock.hpp +++ b/lib/base/objectlock.hpp @@ -31,7 +31,6 @@ namespace icinga struct ObjectLock { public: - ObjectLock(); ObjectLock(const Object::Ptr& object); ObjectLock(const Object *object); @@ -46,8 +45,8 @@ public: void Unlock(); private: - const Object *m_Object; - bool m_Locked; + const Object *m_Object{nullptr}; + bool m_Locked{false}; }; } diff --git a/lib/base/objecttype.cpp b/lib/base/objecttype.cpp index 48521a439..ed0a12bda 100644 --- a/lib/base/objecttype.cpp +++ b/lib/base/objecttype.cpp @@ -29,9 +29,6 @@ INITIALIZE_ONCE_WITH_PRIORITY([]() { Object::TypeInstance = type; }, 20); -ObjectType::ObjectType() -{ } - String ObjectType::GetName() const { return "Object"; diff --git a/lib/base/objecttype.hpp b/lib/base/objecttype.hpp index c1508e0d0..4fb0e5c3d 100644 --- a/lib/base/objecttype.hpp +++ b/lib/base/objecttype.hpp @@ -30,8 +30,6 @@ namespace icinga class ObjectType final : public Type { public: - ObjectType(); - String GetName() const override; Type::Ptr GetBaseType() const override; int GetAttributes() const override; diff --git a/lib/base/perfdatavalue.hpp b/lib/base/perfdatavalue.hpp index c5128f8a7..d79af942c 100644 --- a/lib/base/perfdatavalue.hpp +++ b/lib/base/perfdatavalue.hpp @@ -36,7 +36,7 @@ class PerfdataValue final : public ObjectImpl public: DECLARE_OBJECT(PerfdataValue); - PerfdataValue(); + PerfdataValue() = default; PerfdataValue(const String& label, double value, bool counter = false, const String& unit = "", const Value& warn = Empty, const Value& crit = Empty, diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp index fc12a0b5f..fae5665f3 100644 --- a/lib/base/socket.cpp +++ b/lib/base/socket.cpp @@ -34,18 +34,10 @@ using namespace icinga; -/** - * Constructor for the Socket class. - */ -Socket::Socket() - : m_FD(INVALID_SOCKET) -{ } - /** * Constructor for the Socket class. */ Socket::Socket(SOCKET fd) - : m_FD(INVALID_SOCKET) { SetFD(fd); } diff --git a/lib/base/socket.hpp b/lib/base/socket.hpp index e606f46e5..464983a7c 100644 --- a/lib/base/socket.hpp +++ b/lib/base/socket.hpp @@ -36,7 +36,7 @@ class Socket : public Object public: DECLARE_PTR_TYPEDEFS(Socket); - Socket(); + Socket() = default; Socket(SOCKET fd); ~Socket() override; @@ -67,7 +67,7 @@ protected: mutable boost::mutex m_SocketMutex; private: - SOCKET m_FD; /**< The socket descriptor. */ + SOCKET m_FD{INVALID_SOCKET}; /**< The socket descriptor. */ static String GetAddressFromSockaddr(sockaddr *address, socklen_t len); }; diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp index 1617e6114..7d7ae19fb 100644 --- a/lib/base/socketevents.hpp +++ b/lib/base/socketevents.hpp @@ -77,13 +77,9 @@ private: struct SocketEventDescriptor { - int Events; - SocketEvents *EventInterface; - Object *LifesupportObject; - - SocketEventDescriptor() - : Events(POLLIN), EventInterface(nullptr), LifesupportObject(nullptr) - { } + int Events{POLLIN}; + SocketEvents *EventInterface{nullptr}; + Object *LifesupportObject{nullptr}; }; struct EventDescription diff --git a/lib/base/stream.hpp b/lib/base/stream.hpp index f8a1b6426..0af5fb11a 100644 --- a/lib/base/stream.hpp +++ b/lib/base/stream.hpp @@ -38,10 +38,6 @@ enum ConnectionRole struct StreamReadContext { - StreamReadContext() - : Buffer(nullptr), Size(0), MustRead(true), Eof(false) - { } - ~StreamReadContext() { free(Buffer); @@ -50,10 +46,10 @@ struct StreamReadContext bool FillFromStream(const intrusive_ptr& stream, bool may_wait); void DropData(size_t count); - char *Buffer; - size_t Size; - bool MustRead; - bool Eof; + char *Buffer{nullptr}; + size_t Size{0}; + bool MustRead{true}; + bool Eof{false}; }; enum StreamReadStatus diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp index de9613031..c92fbccbb 100644 --- a/lib/base/streamlogger.cpp +++ b/lib/base/streamlogger.cpp @@ -30,13 +30,6 @@ REGISTER_TYPE(StreamLogger); boost::mutex StreamLogger::m_Mutex; -/** - * Constructor for the StreamLogger class. - */ -StreamLogger::StreamLogger() - : m_Stream(nullptr), m_OwnsStream(false) -{ } - void StreamLogger::Stop(bool runtimeRemoved) { ObjectImpl::Stop(runtimeRemoved); diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp index cf45e1461..6376610e7 100644 --- a/lib/base/streamlogger.hpp +++ b/lib/base/streamlogger.hpp @@ -38,8 +38,6 @@ class StreamLogger : public ObjectImpl public: DECLARE_OBJECT(StreamLogger); - StreamLogger(); - void Stop(bool runtimeRemoved) override; ~StreamLogger() override; @@ -53,8 +51,8 @@ protected: private: static boost::mutex m_Mutex; - std::ostream *m_Stream; - bool m_OwnsStream; + std::ostream *m_Stream{nullptr}; + bool m_OwnsStream{false}; Timer::Ptr m_FlushLogTimer; diff --git a/lib/base/string.cpp b/lib/base/string.cpp index 998a73ceb..393783674 100644 --- a/lib/base/string.cpp +++ b/lib/base/string.cpp @@ -31,10 +31,6 @@ REGISTER_BUILTIN_TYPE(String, String::GetPrototype()); const String::SizeType String::NPos = std::string::npos; -String::String() - : m_Data() -{ } - String::String(const char *data) : m_Data(data) { } @@ -62,9 +58,6 @@ String::String(Value&& other) } #endif /* _MSC_VER */ -String::~String() -{ } - String& String::operator=(Value&& other) { if (other.IsString()) diff --git a/lib/base/string.hpp b/lib/base/string.hpp index d8a8d7626..4a17eaeeb 100644 --- a/lib/base/string.hpp +++ b/lib/base/string.hpp @@ -58,7 +58,7 @@ public: typedef std::string::size_type SizeType; - String(); + String() = default; String(const char *data); String(std::string data); String(String::SizeType n, char c); @@ -69,8 +69,6 @@ public: String(Value&& other); #endif /* _MSC_VER */ - ~String(); - template String(InputIterator begin, InputIterator end) : m_Data(begin, end) diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index 4872652ec..cfee1f98e 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -30,7 +30,7 @@ using namespace icinga; int ThreadPool::m_NextID = 1; ThreadPool::ThreadPool(size_t max_threads) - : m_ID(m_NextID++), m_MaxThreads(max_threads), m_Stopped(true) + : m_ID(m_NextID++), m_MaxThreads(max_threads) { if (m_MaxThreads != UINT_MAX && m_MaxThreads < sizeof(m_Queues) / sizeof(m_Queues[0])) m_MaxThreads = sizeof(m_Queues) / sizeof(m_Queues[0]); diff --git a/lib/base/threadpool.hpp b/lib/base/threadpool.hpp index 34cb432cf..06277c70c 100644 --- a/lib/base/threadpool.hpp +++ b/lib/base/threadpool.hpp @@ -75,14 +75,14 @@ private: struct WorkerThread { - ThreadState State; - bool Zombie; - double Utilization; - double LastUpdate; - boost::thread *Thread; + ThreadState State{ThreadDead}; + bool Zombie{false}; + double Utilization{0}; + double LastUpdate{0}; + boost::thread *Thread{nullptr}; WorkerThread(ThreadState state = ThreadDead) - : State(state), Zombie(false), Utilization(0), LastUpdate(0), Thread(nullptr) + : State(state) { } void UpdateUtilization(ThreadState state = ThreadUnspecified); @@ -98,18 +98,14 @@ private: std::deque Items; - double WaitTime; - double ServiceTime; - int TaskCount; + double WaitTime{0}; + double ServiceTime{0}; + int TaskCount{0}; - bool Stopped; + bool Stopped{false}; WorkerThread Threads[16]; - Queue() - : WaitTime(0), ServiceTime(0), TaskCount(0), Stopped(false) - { } - void SpawnWorker(boost::thread_group& group); void KillWorker(boost::thread_group& group); }; @@ -124,7 +120,7 @@ private: std::thread m_MgmtThread; boost::mutex m_MgmtMutex; boost::condition_variable m_MgmtCV; - bool m_Stopped; + bool m_Stopped{true}; Queue m_Queues[QUEUECOUNT]; diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp index e030bcb4d..d862f8088 100644 --- a/lib/base/timer.cpp +++ b/lib/base/timer.cpp @@ -73,13 +73,6 @@ static bool l_StopTimerThread; static TimerSet l_Timers; static int l_AliveTimers; -/** - * Constructor for the Timer class. - */ -Timer::Timer() - : m_Interval(0), m_Next(0), m_Started(false), m_Running(false) -{ } - /** * Destructor for the Timer class. */ diff --git a/lib/base/timer.hpp b/lib/base/timer.hpp index 639b5f5a1..6d5e115ef 100644 --- a/lib/base/timer.hpp +++ b/lib/base/timer.hpp @@ -38,7 +38,6 @@ class Timer final : public Object public: DECLARE_PTR_TYPEDEFS(Timer); - Timer(); ~Timer() override; static void Uninitialize(); @@ -57,10 +56,10 @@ public: boost::signals2::signal OnTimerExpired; private: - double m_Interval; /**< The interval of the timer. */ - double m_Next; /**< When the next event should happen. */ - bool m_Started; /**< Whether the timer is enabled. */ - bool m_Running; /**< Whether the timer proc is currently running. */ + double m_Interval{0}; /**< The interval of the timer. */ + double m_Next{0}; /**< When the next event should happen. */ + bool m_Started{false}; /**< Whether the timer is enabled. */ + bool m_Running{false}; /**< Whether the timer proc is currently running. */ void Call(); void InternalReschedule(bool completed, double next = -1); diff --git a/lib/base/type.cpp b/lib/base/type.cpp index e4918e9b9..19f1bb5d9 100644 --- a/lib/base/type.cpp +++ b/lib/base/type.cpp @@ -32,12 +32,6 @@ INITIALIZE_ONCE_WITH_PRIORITY([]() { Type::Register(type); }, 20); -Type::Type() -{ } - -Type::~Type() -{ } - String Type::ToString() const { return "type '" + GetName() + "'"; diff --git a/lib/base/type.hpp b/lib/base/type.hpp index 56563adc6..10b8524fe 100644 --- a/lib/base/type.hpp +++ b/lib/base/type.hpp @@ -75,9 +75,6 @@ class Type : public Object public: DECLARE_OBJECT(Type); - Type(); - ~Type() override; - String ToString() const override; virtual String GetName() const = 0; diff --git a/lib/base/value.cpp b/lib/base/value.cpp index 8fe55e851..93c515a2b 100644 --- a/lib/base/value.cpp +++ b/lib/base/value.cpp @@ -32,9 +32,6 @@ template const Object::Ptr& Value::Get() const; Value icinga::Empty; -Value::Value() -{ } - Value::Value(std::nullptr_t) { } @@ -105,9 +102,6 @@ Value::Value(const intrusive_ptr& value) m_Value = value; } -Value::~Value() -{ } - Value& Value::operator=(const Value& other) { m_Value = other.m_Value; diff --git a/lib/base/value.hpp b/lib/base/value.hpp index bff889ec8..29ca2e9f7 100644 --- a/lib/base/value.hpp +++ b/lib/base/value.hpp @@ -52,7 +52,7 @@ enum ValueType class Value { public: - Value(); + Value() = default; Value(std::nullptr_t); Value(int value); Value(unsigned int value); @@ -77,8 +77,6 @@ public: static_assert(!std::is_same::value, "T must not be Object"); } - ~Value(); - bool ToBool() const; operator double() const; diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index 53291862b..f8247bb7e 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -31,8 +31,8 @@ std::atomic WorkQueue::m_NextID(1); boost::thread_specific_ptr l_ThreadWorkQueue; WorkQueue::WorkQueue(size_t maxItems, int threadCount) - : m_ID(m_NextID++), m_ThreadCount(threadCount), m_Spawned(false), m_MaxItems(maxItems), m_Stopped(false), - m_Processing(0), m_NextTaskID(0), m_TaskStats(15 * 60), m_PendingTasks(0), m_PendingTasksTimestamp(0) + : m_ID(m_NextID++), m_ThreadCount(threadCount), m_MaxItems(maxItems), + m_TaskStats(15 * 60) { /* Initialize logger. */ m_StatusTimerTimeout = Utility::GetTime(); diff --git a/lib/base/workqueue.hpp b/lib/base/workqueue.hpp index 82d4e2dfe..955651b4a 100644 --- a/lib/base/workqueue.hpp +++ b/lib/base/workqueue.hpp @@ -43,17 +43,15 @@ enum WorkQueuePriority struct Task { - Task() - : Priority(PriorityNormal), ID(-1) - { } + Task() = default; - Task(std::function&& function, WorkQueuePriority priority, int id) + Task(std::function function, WorkQueuePriority priority, int id) : Function(std::move(function)), Priority(priority), ID(id) { } std::function Function; - WorkQueuePriority Priority; - int ID; + WorkQueuePriority Priority{PriorityNormal}; + int ID{-1}; }; inline bool operator<(const Task& a, const Task& b) @@ -110,7 +108,7 @@ private: String m_Name; static std::atomic m_NextID; int m_ThreadCount; - bool m_Spawned; + bool m_Spawned{false}; mutable boost::mutex m_Mutex; boost::condition_variable m_CVEmpty; @@ -118,10 +116,10 @@ private: boost::condition_variable m_CVStarved; boost::thread_group m_Threads; size_t m_MaxItems; - bool m_Stopped; - int m_Processing; + bool m_Stopped{false}; + int m_Processing{0}; std::priority_queue > m_Tasks; - int m_NextTaskID; + int m_NextTaskID{0}; ExceptionCallback m_ExceptionCallback; std::vector m_Exceptions; Timer::Ptr m_StatusTimer; @@ -129,8 +127,8 @@ private: mutable boost::mutex m_StatsMutex; RingBuffer m_TaskStats; - size_t m_PendingTasks; - double m_PendingTasksTimestamp; + size_t m_PendingTasks{0}; + double m_PendingTasksTimestamp{0}; void WorkerThreadProc(); void StatusTimerHandler(); diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp index e9cbf998d..bb30b6836 100644 --- a/lib/checker/checkercomponent.cpp +++ b/lib/checker/checkercomponent.cpp @@ -59,10 +59,6 @@ void CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr status->Set("checkercomponent", nodes); } -CheckerComponent::CheckerComponent() - : m_Stopped(false) -{ } - void CheckerComponent::OnConfigLoaded() { ConfigObject::OnActiveChanged.connect(std::bind(&CheckerComponent::ObjectHandler, this, _1)); diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp index f89e53452..fd67b9445 100644 --- a/lib/checker/checkercomponent.hpp +++ b/lib/checker/checkercomponent.hpp @@ -77,8 +77,6 @@ public: > > CheckableSet; - CheckerComponent(); - void OnConfigLoaded() override; void Start(bool runtimeCreated) override; void Stop(bool runtimeRemoved) override; @@ -90,7 +88,7 @@ public: private: boost::mutex m_Mutex; boost::condition_variable m_CV; - bool m_Stopped; + bool m_Stopped{false}; std::thread m_Thread; CheckableSet m_IdleCheckables; diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp index e6596c601..b298a33ec 100644 --- a/lib/config/configcompilercontext.cpp +++ b/lib/config/configcompilercontext.cpp @@ -31,10 +31,6 @@ ConfigCompilerContext *ConfigCompilerContext::GetInstance() return Singleton::GetInstance(); } -ConfigCompilerContext::ConfigCompilerContext() - : m_ObjectsFP(nullptr) -{ } - void ConfigCompilerContext::OpenObjectsFile(const String& filename) { m_ObjectsPath = filename; diff --git a/lib/config/configcompilercontext.hpp b/lib/config/configcompilercontext.hpp index e0e49dc98..7a7fb54c8 100644 --- a/lib/config/configcompilercontext.hpp +++ b/lib/config/configcompilercontext.hpp @@ -34,8 +34,6 @@ namespace icinga class ConfigCompilerContext { public: - ConfigCompilerContext(); - void OpenObjectsFile(const String& filename); void WriteObject(const Dictionary::Ptr& object); void CancelObjectsFile(); @@ -46,7 +44,7 @@ public: private: String m_ObjectsPath; String m_ObjectsTempFile; - std::fstream *m_ObjectsFP; + std::fstream *m_ObjectsFP{nullptr}; mutable boost::mutex m_Mutex; }; diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp index b017daafe..e37430dea 100644 --- a/lib/config/configitembuilder.cpp +++ b/lib/config/configitembuilder.cpp @@ -23,15 +23,6 @@ using namespace icinga; -ConfigItemBuilder::ConfigItemBuilder() - : m_Abstract(false), m_DefaultTmpl(false), m_IgnoreOnError(false) -{ - m_DebugInfo.FirstLine = 0; - m_DebugInfo.FirstColumn = 0; - m_DebugInfo.LastLine = 0; - m_DebugInfo.LastColumn = 0; -} - ConfigItemBuilder::ConfigItemBuilder(const DebugInfo& debugInfo) : m_Abstract(false), m_DefaultTmpl(false), m_IgnoreOnError(false) { diff --git a/lib/config/configitembuilder.hpp b/lib/config/configitembuilder.hpp index 250d28853..a9f9ea506 100644 --- a/lib/config/configitembuilder.hpp +++ b/lib/config/configitembuilder.hpp @@ -39,7 +39,7 @@ class ConfigItemBuilder final : public Object public: DECLARE_PTR_TYPEDEFS(ConfigItemBuilder); - ConfigItemBuilder(); + ConfigItemBuilder() = default; explicit ConfigItemBuilder(const DebugInfo& debugInfo); void SetType(const Type::Ptr& type); @@ -59,15 +59,15 @@ public: private: Type::Ptr m_Type; /**< The object type. */ String m_Name; /**< The name. */ - bool m_Abstract; /**< Whether the item is abstract. */ + bool m_Abstract{false}; /**< Whether the item is abstract. */ std::vector > m_Expressions; /**< Expressions for this item. */ std::shared_ptr m_Filter; /**< Filter expression. */ DebugInfo m_DebugInfo; /**< Debug information. */ Dictionary::Ptr m_Scope; /**< variable scope. */ String m_Zone; /**< The zone. */ String m_Package; /**< The package name. */ - bool m_DefaultTmpl; - bool m_IgnoreOnError; /**< Whether the object should be ignored when an error occurs in one of the expressions. */ + bool m_DefaultTmpl{false}; + bool m_IgnoreOnError{false}; /**< Whether the object should be ignored when an error occurs in one of the expressions. */ }; } diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index 8c2882cdd..ce3f438e6 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -599,7 +599,7 @@ class DictExpression final : public DebuggableExpression { public: DictExpression(std::vector >&& expressions = {}, const DebugInfo& debugInfo = DebugInfo()) - : DebuggableExpression(debugInfo), m_Expressions(std::move(expressions)), m_Inline(false) + : DebuggableExpression(debugInfo), m_Expressions(std::move(expressions)) { } void MakeInline(); @@ -609,7 +609,7 @@ protected: private: std::vector > m_Expressions; - bool m_Inline; + bool m_Inline{false}; friend void BindToScope(std::unique_ptr& expr, ScopeSpecifier scopeSpec); }; diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index 496b65614..9249697de 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -37,10 +37,6 @@ REGISTER_TYPE(DbConnection); Timer::Ptr DbConnection::m_ProgramStatusTimer; boost::once_flag DbConnection::m_OnceFlag = BOOST_ONCE_INIT; -DbConnection::DbConnection() - : m_IDCacheValid(false), m_QueryStats(15 * 60), m_ActiveChangedHandler(false) -{ } - void DbConnection::OnConfigLoaded() { ConfigObject::OnConfigLoaded(); diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp index ea8cd7ac8..932e3e1b4 100644 --- a/lib/db_ido/dbconnection.hpp +++ b/lib/db_ido/dbconnection.hpp @@ -45,8 +45,6 @@ class DbConnection : public ObjectImpl public: DECLARE_OBJECT(DbConnection); - DbConnection(); - static void InitializeDbTimer(); void SetConfigHash(const DbObject::Ptr& dbobj, const String& hash); @@ -112,7 +110,7 @@ protected: static int GetSessionToken(); private: - bool m_IDCacheValid; + bool m_IDCacheValid{false}; std::map, String> m_ConfigHashes; std::map m_ObjectIDs; std::map, DbReference> m_InsertIDs; @@ -129,8 +127,8 @@ private: static void InsertRuntimeVariable(const String& key, const Value& value); mutable boost::mutex m_StatsMutex; - RingBuffer m_QueryStats; - bool m_ActiveChangedHandler; + RingBuffer m_QueryStats{15 * 60}; + bool m_ActiveChangedHandler{false}; }; struct database_error : virtual std::exception, virtual boost::exception { }; diff --git a/lib/db_ido/dbquery.hpp b/lib/db_ido/dbquery.hpp index 40c481ea9..fe1220681 100644 --- a/lib/db_ido/dbquery.hpp +++ b/lib/db_ido/dbquery.hpp @@ -62,24 +62,20 @@ class DbObject; struct DbQuery { - int Type; - DbQueryCategory Category; + int Type{0}; + DbQueryCategory Category{DbCatInvalid}; String Table; String IdColumn; Dictionary::Ptr Fields; Dictionary::Ptr WhereCriteria; intrusive_ptr Object; DbValue::Ptr NotificationInsertID; - bool ConfigUpdate; - bool StatusUpdate; - WorkQueuePriority Priority; + bool ConfigUpdate{false}; + bool StatusUpdate{false}; + WorkQueuePriority Priority{PriorityNormal}; static void StaticInitialize(); - DbQuery() - : Type(0), Category(DbCatInvalid), ConfigUpdate(false), StatusUpdate(false), Priority(PriorityNormal) - { } - static const std::map& GetCategoryFilterMap(); private: diff --git a/lib/db_ido/dbreference.cpp b/lib/db_ido/dbreference.cpp index 971001a23..f2eba39bf 100644 --- a/lib/db_ido/dbreference.cpp +++ b/lib/db_ido/dbreference.cpp @@ -21,10 +21,6 @@ using namespace icinga; -DbReference::DbReference() - : m_Id(-1) -{ } - DbReference::DbReference(long id) : m_Id(id) { } diff --git a/lib/db_ido/dbreference.hpp b/lib/db_ido/dbreference.hpp index d547d83b1..eef22157a 100644 --- a/lib/db_ido/dbreference.hpp +++ b/lib/db_ido/dbreference.hpp @@ -33,13 +33,13 @@ namespace icinga struct DbReference { public: - DbReference(); + DbReference() = default; DbReference(long id); bool IsValid() const; operator long() const; private: - long m_Id; + long m_Id{-1}; }; } diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index 28b60e0dc..999d90161 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -38,10 +38,6 @@ using namespace icinga; REGISTER_TYPE(IdoMysqlConnection); REGISTER_STATSFUNCTION(IdoMysqlConnection, &IdoMysqlConnection::StatsFunc); -IdoMysqlConnection::IdoMysqlConnection() - : m_QueryQueue(10000000) -{ } - void IdoMysqlConnection::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); @@ -654,7 +650,7 @@ DbReference IdoMysqlConnection::GetLastInsertID() { AssertOnWorkQueue(); - return {m_Mysql->insert_id(&m_Connection)}; + return {static_cast(m_Mysql->insert_id(&m_Connection))}; } int IdoMysqlConnection::GetAffectedRows() diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp index 67fba0101..fa2383cd4 100644 --- a/lib/db_ido_mysql/idomysqlconnection.hpp +++ b/lib/db_ido_mysql/idomysqlconnection.hpp @@ -51,8 +51,6 @@ public: DECLARE_OBJECT(IdoMysqlConnection); DECLARE_OBJECTNAME(IdoMysqlConnection); - IdoMysqlConnection(); - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); int GetPendingQueryCount() const override; @@ -73,7 +71,7 @@ protected: private: DbReference m_InstanceID; - WorkQueue m_QueryQueue; + WorkQueue m_QueryQueue{10000000}; Library m_Library; std::unique_ptr m_Mysql; diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index e4da2c151..dbc8c1732 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -41,7 +41,6 @@ REGISTER_TYPE(IdoPgsqlConnection); REGISTER_STATSFUNCTION(IdoPgsqlConnection, &IdoPgsqlConnection::StatsFunc); IdoPgsqlConnection::IdoPgsqlConnection() - : m_QueryQueue(1000000) { m_QueryQueue.SetName("IdoPgsqlConnection, " + GetName()); } diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp index 1d0e2f710..b00a4b707 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.hpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp @@ -65,7 +65,7 @@ protected: private: DbReference m_InstanceID; - WorkQueue m_QueryQueue; + WorkQueue m_QueryQueue{1000000}; Library m_Library; std::unique_ptr m_Pgsql; diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 31532f73a..13852e94e 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -44,7 +44,6 @@ void Checkable::StaticInitialize() } Checkable::Checkable() - : m_CheckRunning(false) { SetSchedulingOffset(Utility::Random()); } diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index 202a7eca6..b2061be29 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -206,7 +206,7 @@ protected: private: mutable boost::mutex m_CheckableMutex; - bool m_CheckRunning; + bool m_CheckRunning{false}; long m_SchedulingOffset; static boost::mutex m_StatsMutex; diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index c5bc72e1c..9a0e7840f 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -422,17 +422,13 @@ Value MacroProcessor::EscapeMacroShellArg(const Value& value) struct CommandArgument { - int Order; - bool SkipKey; - bool RepeatKey; - bool SkipValue; + int Order{0}; + bool SkipKey{false}; + bool RepeatKey{true}; + bool SkipValue{false}; String Key; Value AValue; - CommandArgument() - : Order(0), SkipKey(false), RepeatKey(true), SkipValue(false) - { } - bool operator<(const CommandArgument& rhs) const { return Order < rhs.Order; diff --git a/lib/livestatus/aggregator.cpp b/lib/livestatus/aggregator.cpp index 16aaadcda..1cc4b9762 100644 --- a/lib/livestatus/aggregator.cpp +++ b/lib/livestatus/aggregator.cpp @@ -21,9 +21,6 @@ using namespace icinga; -Aggregator::Aggregator() -{ } - void Aggregator::SetFilter(const Filter::Ptr& filter) { m_Filter = filter; diff --git a/lib/livestatus/aggregator.hpp b/lib/livestatus/aggregator.hpp index f37b0e566..28aa60355 100644 --- a/lib/livestatus/aggregator.hpp +++ b/lib/livestatus/aggregator.hpp @@ -48,7 +48,7 @@ public: void SetFilter(const Filter::Ptr& filter); protected: - Aggregator(); + Aggregator() = default; Filter::Ptr GetFilter() const; diff --git a/lib/livestatus/andfilter.cpp b/lib/livestatus/andfilter.cpp index 4b73eedc6..66b46766b 100644 --- a/lib/livestatus/andfilter.cpp +++ b/lib/livestatus/andfilter.cpp @@ -21,9 +21,6 @@ using namespace icinga; -AndFilter::AndFilter() -{ } - bool AndFilter::Apply(const Table::Ptr& table, const Value& row) { for (const Filter::Ptr& filter : m_Filters) { diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp index 9d7303038..cdbd21752 100644 --- a/lib/livestatus/andfilter.hpp +++ b/lib/livestatus/andfilter.hpp @@ -35,8 +35,6 @@ class AndFilter final : public CombinerFilter public: DECLARE_PTR_TYPEDEFS(AndFilter); - AndFilter(); - bool Apply(const Table::Ptr& table, const Value& row) override; }; diff --git a/lib/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp index 183ddb059..664134832 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -31,12 +31,8 @@ namespace icinga */ struct AvgAggregatorState final : public AggregatorState { - AvgAggregatorState() - : Avg(0), AvgCount(0) - { } - - double Avg; - double AvgCount; + double Avg{0}; + double AvgCount{0}; }; /** diff --git a/lib/livestatus/combinerfilter.cpp b/lib/livestatus/combinerfilter.cpp index 5a4ca1414..0657b8397 100644 --- a/lib/livestatus/combinerfilter.cpp +++ b/lib/livestatus/combinerfilter.cpp @@ -21,9 +21,6 @@ using namespace icinga; -CombinerFilter::CombinerFilter() -{ } - void CombinerFilter::AddSubFilter(const Filter::Ptr& filter) { m_Filters.push_back(filter); diff --git a/lib/livestatus/combinerfilter.hpp b/lib/livestatus/combinerfilter.hpp index 63e614e84..56b7e9b90 100644 --- a/lib/livestatus/combinerfilter.hpp +++ b/lib/livestatus/combinerfilter.hpp @@ -40,7 +40,7 @@ public: protected: std::vector m_Filters; - CombinerFilter(); + CombinerFilter() = default; }; } diff --git a/lib/livestatus/countaggregator.hpp b/lib/livestatus/countaggregator.hpp index 22e110cd6..5b4d19588 100644 --- a/lib/livestatus/countaggregator.hpp +++ b/lib/livestatus/countaggregator.hpp @@ -31,11 +31,7 @@ namespace icinga */ struct CountAggregatorState final : public AggregatorState { - CountAggregatorState() - : Count(0) - { } - - int Count; + int Count{0}; }; /** diff --git a/lib/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp index 05a255da8..d8e43d6aa 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -31,12 +31,8 @@ namespace icinga */ struct InvAvgAggregatorState final : public AggregatorState { - InvAvgAggregatorState() - : InvAvg(0), InvAvgCount(0) - { } - - double InvAvg; - double InvAvgCount; + double InvAvg{0}; + double InvAvgCount{0}; }; /** diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index 65b8d026d..709928fd1 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -31,11 +31,7 @@ namespace icinga */ struct InvSumAggregatorState final : public AggregatorState { - InvSumAggregatorState() - : InvSum(0) - { } - - double InvSum; + double InvSum{0}; }; /** diff --git a/lib/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp index fd102d1f2..3207159f1 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -31,11 +31,7 @@ namespace icinga */ struct MaxAggregatorState final : public AggregatorState { - MaxAggregatorState() - : Max(0) - { } - - double Max; + double Max{0}; }; /** diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index b9560937d..76be4d10e 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -32,11 +32,7 @@ namespace icinga */ struct MinAggregatorState final : public AggregatorState { - MinAggregatorState() - : Min(DBL_MAX) - { } - - double Min; + double Min{DBL_MAX}; }; /** diff --git a/lib/livestatus/orfilter.cpp b/lib/livestatus/orfilter.cpp index 586eec50c..14da7b7a2 100644 --- a/lib/livestatus/orfilter.cpp +++ b/lib/livestatus/orfilter.cpp @@ -21,9 +21,6 @@ using namespace icinga; -OrFilter::OrFilter() -{ } - bool OrFilter::Apply(const Table::Ptr& table, const Value& row) { if (m_Filters.empty()) diff --git a/lib/livestatus/orfilter.hpp b/lib/livestatus/orfilter.hpp index be308ecf6..d37f2e09f 100644 --- a/lib/livestatus/orfilter.hpp +++ b/lib/livestatus/orfilter.hpp @@ -35,8 +35,6 @@ class OrFilter final : public CombinerFilter public: DECLARE_PTR_TYPEDEFS(OrFilter); - OrFilter(); - bool Apply(const Table::Ptr& table, const Value& row) override; }; diff --git a/lib/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp index 75c4e3e86..e7b0509eb 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -31,13 +31,9 @@ namespace icinga */ struct StdAggregatorState final : public AggregatorState { - StdAggregatorState() - : StdSum(0), StdQSum(0), StdCount(0) - { } - - double StdSum; - double StdQSum; - double StdCount; + double StdSum{0}; + double StdQSum{0}; + double StdCount{0}; }; /** diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index b2359e642..030d15761 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -31,11 +31,7 @@ namespace icinga */ struct SumAggregatorState final : public AggregatorState { - SumAggregatorState() - : Sum(0) - { } - - double Sum; + double Sum{0}; }; /** diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp index c5e689f27..cfea33819 100644 --- a/lib/perfdata/elasticsearchwriter.cpp +++ b/lib/perfdata/elasticsearchwriter.cpp @@ -44,10 +44,6 @@ REGISTER_TYPE(ElasticsearchWriter); REGISTER_STATSFUNCTION(ElasticsearchWriter, &ElasticsearchWriter::StatsFunc); -ElasticsearchWriter::ElasticsearchWriter() - : m_WorkQueue(10000000, 1) -{ } - void ElasticsearchWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp index 4779fefb2..a1732ee84 100644 --- a/lib/perfdata/elasticsearchwriter.hpp +++ b/lib/perfdata/elasticsearchwriter.hpp @@ -35,8 +35,6 @@ public: DECLARE_OBJECT(ElasticsearchWriter); DECLARE_OBJECTNAME(ElasticsearchWriter); - ElasticsearchWriter(); - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); static String FormatTimestamp(double ts); @@ -48,7 +46,7 @@ protected: private: String m_EventPrefix; - WorkQueue m_WorkQueue; + WorkQueue m_WorkQueue{10000000, 1}; Timer::Ptr m_FlushTimer; std::vector m_DataBuffer; boost::mutex m_DataBufferMutex; diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp index 490672f33..6742a11da 100644 --- a/lib/perfdata/gelfwriter.cpp +++ b/lib/perfdata/gelfwriter.cpp @@ -46,10 +46,6 @@ REGISTER_TYPE(GelfWriter); REGISTER_STATSFUNCTION(GelfWriter, &GelfWriter::StatsFunc); -GelfWriter::GelfWriter() - : m_WorkQueue(10000000, 1) -{ } - void GelfWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp index 261046e4e..0576ede1b 100644 --- a/lib/perfdata/gelfwriter.hpp +++ b/lib/perfdata/gelfwriter.hpp @@ -42,8 +42,6 @@ public: DECLARE_OBJECT(GelfWriter); DECLARE_OBJECTNAME(GelfWriter); - GelfWriter(); - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: @@ -53,7 +51,7 @@ protected: private: Stream::Ptr m_Stream; - WorkQueue m_WorkQueue; + WorkQueue m_WorkQueue{10000000, 1}; Timer::Ptr m_ReconnectTimer; diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp index bb5f20bda..c1e832128 100644 --- a/lib/perfdata/graphitewriter.cpp +++ b/lib/perfdata/graphitewriter.cpp @@ -46,10 +46,6 @@ REGISTER_TYPE(GraphiteWriter); REGISTER_STATSFUNCTION(GraphiteWriter, &GraphiteWriter::StatsFunc); -GraphiteWriter::GraphiteWriter() - : m_WorkQueue(10000000, 1) -{ } - void GraphiteWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp index 7c0606580..e5652add0 100644 --- a/lib/perfdata/graphitewriter.hpp +++ b/lib/perfdata/graphitewriter.hpp @@ -42,8 +42,6 @@ public: DECLARE_OBJECT(GraphiteWriter); DECLARE_OBJECTNAME(GraphiteWriter); - GraphiteWriter(); - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); void ValidateHostNameTemplate(const String& value, const ValidationUtils& utils) override; @@ -56,7 +54,7 @@ protected: private: Stream::Ptr m_Stream; - WorkQueue m_WorkQueue; + WorkQueue m_WorkQueue{10000000, 1}; Timer::Ptr m_ReconnectTimer; diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp index 3121d2ab9..ef1a4dd52 100644 --- a/lib/perfdata/influxdbwriter.cpp +++ b/lib/perfdata/influxdbwriter.cpp @@ -72,10 +72,6 @@ REGISTER_TYPE(InfluxdbWriter); REGISTER_STATSFUNCTION(InfluxdbWriter, &InfluxdbWriter::StatsFunc); -InfluxdbWriter::InfluxdbWriter() - : m_WorkQueue(10000000, 1) -{ } - void InfluxdbWriter::OnConfigLoaded() { ObjectImpl::OnConfigLoaded(); diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp index cf7be26ff..8332c2fb2 100644 --- a/lib/perfdata/influxdbwriter.hpp +++ b/lib/perfdata/influxdbwriter.hpp @@ -42,8 +42,6 @@ public: DECLARE_OBJECT(InfluxdbWriter); DECLARE_OBJECTNAME(InfluxdbWriter); - InfluxdbWriter(); - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); void ValidateHostTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; @@ -55,7 +53,7 @@ protected: void Stop(bool runtimeRemoved) override; private: - WorkQueue m_WorkQueue; + WorkQueue m_WorkQueue{10000000, 1}; Timer::Ptr m_FlushTimer; std::vector m_DataBuffer; diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index a3051b874..e639ee8c0 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -49,7 +49,6 @@ REGISTER_STATSFUNCTION(ApiListener, &ApiListener::StatsFunc); REGISTER_APIFUNCTION(Hello, icinga, &ApiListener::HelloAPIHandler); ApiListener::ApiListener() - : m_SyncQueue(0, 4), m_LogMessageCount(0) { m_RelayQueue.SetName("ApiListener, RelayQueue"); m_SyncQueue.SetName("ApiListener, SyncQueue"); diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp index 81b1310d3..5405914a6 100644 --- a/lib/remote/apilistener.hpp +++ b/lib/remote/apilistener.hpp @@ -145,11 +145,11 @@ private: void ListenerThreadProc(const Socket::Ptr& server); WorkQueue m_RelayQueue; - WorkQueue m_SyncQueue; + WorkQueue m_SyncQueue{0, 4}; boost::mutex m_LogLock; Stream::Ptr m_LogFile; - size_t m_LogMessageCount; + size_t m_LogMessageCount{0}; bool RelayMessageOne(const Zone::Ptr& zone, const MessageOrigin::Ptr& origin, const Dictionary::Ptr& message, const Endpoint::Ptr& currentMaster); void SyncRelayMessage(const MessageOrigin::Ptr& origin, const ConfigObject::Ptr& secobj, const Dictionary::Ptr& message, bool log); diff --git a/lib/remote/consolehandler.hpp b/lib/remote/consolehandler.hpp index ce7ae8f33..6e63c0c77 100644 --- a/lib/remote/consolehandler.hpp +++ b/lib/remote/consolehandler.hpp @@ -28,14 +28,10 @@ namespace icinga struct ApiScriptFrame { - double Seen; - int NextLine; + double Seen{0}; + int NextLine{1}; std::map Lines; Dictionary::Ptr Locals; - - ApiScriptFrame() - : Seen(0), NextLine(1) - { } }; class ConsoleHandler final : public HttpHandler diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp index 2facf67b3..a354edbf0 100644 --- a/lib/remote/endpoint.cpp +++ b/lib/remote/endpoint.cpp @@ -34,10 +34,6 @@ REGISTER_TYPE(Endpoint); boost::signals2::signal Endpoint::OnConnected; boost::signals2::signal Endpoint::OnDisconnected; -Endpoint::Endpoint() - : m_MessagesSent(60), m_MessagesReceived(60), m_BytesSent(60), m_BytesReceived(60) -{ } - void Endpoint::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp index fa43310c0..254492ebc 100644 --- a/lib/remote/endpoint.hpp +++ b/lib/remote/endpoint.hpp @@ -42,8 +42,6 @@ public: DECLARE_OBJECT(Endpoint); DECLARE_OBJECTNAME(Endpoint); - Endpoint(); - static boost::signals2::signal&)> OnConnected; static boost::signals2::signal&)> OnDisconnected; @@ -76,10 +74,10 @@ private: std::set > m_Clients; intrusive_ptr m_Zone; - mutable RingBuffer m_MessagesSent; - mutable RingBuffer m_MessagesReceived; - mutable RingBuffer m_BytesSent; - mutable RingBuffer m_BytesReceived; + mutable RingBuffer m_MessagesSent{60}; + mutable RingBuffer m_MessagesReceived{60}; + mutable RingBuffer m_BytesSent{60}; + mutable RingBuffer m_BytesReceived{60}; }; } diff --git a/lib/remote/url.cpp b/lib/remote/url.cpp index d10a62d47..262de301b 100644 --- a/lib/remote/url.cpp +++ b/lib/remote/url.cpp @@ -26,9 +26,6 @@ using namespace icinga; -Url::Url() -{ } - Url::Url(const String& base_url) { String url = base_url; diff --git a/lib/remote/url.hpp b/lib/remote/url.hpp index 29a7c1fbd..ac022f427 100644 --- a/lib/remote/url.hpp +++ b/lib/remote/url.hpp @@ -41,7 +41,7 @@ class Url final : public Object public: DECLARE_PTR_TYPEDEFS(Url); - Url(); + Url() = default; Url(const String& url); String Format(bool onlyPathAndQuery = false, bool printCredentials = false) const; diff --git a/tools/mkclass/classcompiler.hpp b/tools/mkclass/classcompiler.hpp index d01d5e90c..3f0e7d4ea 100644 --- a/tools/mkclass/classcompiler.hpp +++ b/tools/mkclass/classcompiler.hpp @@ -81,13 +81,9 @@ enum FieldAttribute struct FieldType { - bool IsName; + bool IsName{false}; std::string TypeName; - int ArrayRank; - - FieldType() - : IsName(false), ArrayRank(0) - { } + int ArrayRank{0}; inline std::string GetRealType() const { @@ -113,23 +109,19 @@ struct FieldType struct Field { - int Attributes; + int Attributes{0}; FieldType Type; std::string Name; std::string AlternativeName; std::string GetAccessor; - bool PureGetAccessor; + bool PureGetAccessor{false}; std::string SetAccessor; - bool PureSetAccessor; + bool PureSetAccessor{false}; std::string DefaultAccessor; std::string TrackAccessor; std::string NavigationName; std::string NavigateAccessor; - bool PureNavigateAccessor; - - Field() - : Attributes(0), PureGetAccessor(false), PureSetAccessor(false), PureNavigateAccessor(false) - { } + bool PureNavigateAccessor{false}; inline std::string GetFriendlyName() const { From f05459b40cad2817ced9b24023f7ea8c92a25de1 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 10:36:35 +0100 Subject: [PATCH 11/12] Move inline functions to their .cpp files --- lib/base/exception.cpp | 31 +++++++++++++++++++++++++++++++ lib/base/exception.hpp | 30 ++++-------------------------- lib/base/object.cpp | 32 ++++++++++++++++++++++++++++++++ lib/base/object.hpp | 34 ++-------------------------------- lib/base/tlsutility.cpp | 15 +++++++++++++++ lib/base/tlsutility.hpp | 15 +-------------- lib/base/workqueue.cpp | 15 +++++++++++++++ lib/base/workqueue.hpp | 15 +-------------- 8 files changed, 101 insertions(+), 86 deletions(-) diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 5d7f901b7..51320f5a3 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -406,3 +406,34 @@ Dictionary::Ptr ValidationError::GetDebugHint() const return m_DebugHint; } +std::string icinga::to_string(const StackTraceErrorInfo&) +{ + return ""; +} + +#ifdef _WIN32 +std::string icinga::to_string(const errinfo_win32_error& e) +{ + return "[errinfo_win32_error] = " + Utility::FormatErrorNumber(e.value()) + "\n"; +} +#endif /* _WIN32 */ + +std::string icinga::to_string(const errinfo_getaddrinfo_error& e) +{ + String msg; + +#ifdef _WIN32 + msg = gai_strerrorA(e.value()); +#else /* _WIN32 */ + msg = gai_strerror(e.value()); +#endif /* _WIN32 */ + + return "[errinfo_getaddrinfo_error] = " + String(msg) + "\n"; +} + +std::string icinga::to_string(const ContextTraceErrorInfo& e) +{ + std::ostringstream msgbuf; + msgbuf << "[Context] = " << e.value(); + return msgbuf.str(); +} diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index df41d4523..e4f53e50b 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -106,19 +106,11 @@ void RethrowUncaughtException(); typedef boost::error_info StackTraceErrorInfo; -inline std::string to_string(const StackTraceErrorInfo&) -{ - return ""; -} +std::string to_string(const StackTraceErrorInfo&); typedef boost::error_info ContextTraceErrorInfo; -inline std::string to_string(const ContextTraceErrorInfo& e) -{ - std::ostringstream msgbuf; - msgbuf << "[Context] = " << e.value(); - return msgbuf.str(); -} +std::string to_string(const ContextTraceErrorInfo& e); String DiagnosticInformation(const std::exception& ex, bool verbose = true, StackTrace *stack = nullptr, ContextTrace *context = nullptr); String DiagnosticInformation(const boost::exception_ptr& eptr, bool verbose = true); @@ -139,27 +131,13 @@ class win32_error : virtual public std::exception, virtual public boost::excepti struct errinfo_win32_error_; typedef boost::error_info errinfo_win32_error; -inline std::string to_string(const errinfo_win32_error& e) -{ - return "[errinfo_win32_error] = " + Utility::FormatErrorNumber(e.value()) + "\n"; -} +std::string to_string(const errinfo_win32_error& e); #endif /* _WIN32 */ struct errinfo_getaddrinfo_error_; typedef boost::error_info errinfo_getaddrinfo_error; -inline std::string to_string(const errinfo_getaddrinfo_error& e) -{ - String msg; - -#ifdef _WIN32 - msg = gai_strerrorA(e.value()); -#else /* _WIN32 */ - msg = gai_strerror(e.value()); -#endif /* _WIN32 */ - - return "[errinfo_getaddrinfo_error] = " + String(msg) + "\n"; -} +std::string to_string(const errinfo_getaddrinfo_error& e); struct errinfo_message_; typedef boost::error_info errinfo_message; diff --git a/lib/base/object.cpp b/lib/base/object.cpp index add244396..51a850d37 100644 --- a/lib/base/object.cpp +++ b/lib/base/object.cpp @@ -252,3 +252,35 @@ INITIALIZE_ONCE([]() { }); #endif /* I2_LEAK_DEBUG */ +void icinga::intrusive_ptr_add_ref(Object *object) +{ +#ifdef I2_LEAK_DEBUG + if (object->m_References == 0) + TypeAddObject(object); +#endif /* I2_LEAK_DEBUG */ + +#ifdef _WIN32 + InterlockedIncrement(&object->m_References); +#else /* _WIN32 */ + __sync_add_and_fetch(&object->m_References, 1); +#endif /* _WIN32 */ +} + +void icinga::intrusive_ptr_release(Object *object) +{ + uintptr_t refs; + +#ifdef _WIN32 + refs = InterlockedDecrement(&object->m_References); +#else /* _WIN32 */ + refs = __sync_sub_and_fetch(&object->m_References, 1); +#endif /* _WIN32 */ + + if (unlikely(refs == 0)) { +#ifdef I2_LEAK_DEBUG + TypeRemoveObject(object); +#endif /* I2_LEAK_DEBUG */ + + delete object; + } +} diff --git a/lib/base/object.hpp b/lib/base/object.hpp index 40eae3431..d6d9bc79f 100644 --- a/lib/base/object.hpp +++ b/lib/base/object.hpp @@ -164,38 +164,8 @@ Value GetPrototypeField(const Value& context, const String& field, bool not_foun void TypeAddObject(Object *object); void TypeRemoveObject(Object *object); -inline void intrusive_ptr_add_ref(Object *object) -{ -#ifdef I2_LEAK_DEBUG - if (object->m_References == 0) - TypeAddObject(object); -#endif /* I2_LEAK_DEBUG */ - -#ifdef _WIN32 - InterlockedIncrement(&object->m_References); -#else /* _WIN32 */ - __sync_add_and_fetch(&object->m_References, 1); -#endif /* _WIN32 */ -} - -inline void intrusive_ptr_release(Object *object) -{ - uintptr_t refs; - -#ifdef _WIN32 - refs = InterlockedDecrement(&object->m_References); -#else /* _WIN32 */ - refs = __sync_sub_and_fetch(&object->m_References, 1); -#endif /* _WIN32 */ - - if (unlikely(refs == 0)) { -#ifdef I2_LEAK_DEBUG - TypeRemoveObject(object); -#endif /* I2_LEAK_DEBUG */ - - delete object; - } -} +void intrusive_ptr_add_ref(Object *object); +void intrusive_ptr_release(Object *object); template class ObjectImpl diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp index 4adf04f33..3955ceca4 100644 --- a/lib/base/tlsutility.cpp +++ b/lib/base/tlsutility.cpp @@ -782,4 +782,19 @@ bool VerifyCertificate(const std::shared_ptr& caCertificate, const std::sh return rc == 1; } +std::string to_string(const errinfo_openssl_error& e) +{ + std::ostringstream tmp; + int code = e.value(); + char errbuf[120]; + + const char *message = ERR_error_string(code, errbuf); + + if (!message) + message = "Unknown error."; + + tmp << code << ", \"" << message << "\""; + return "[errinfo_openssl_error]" + tmp.str() + "\n"; +} + } diff --git a/lib/base/tlsutility.hpp b/lib/base/tlsutility.hpp index 18ffa7f26..7928c56d1 100644 --- a/lib/base/tlsutility.hpp +++ b/lib/base/tlsutility.hpp @@ -61,20 +61,7 @@ class openssl_error : virtual public std::exception, virtual public boost::excep struct errinfo_openssl_error_; typedef boost::error_info errinfo_openssl_error; -inline std::string to_string(const errinfo_openssl_error& e) -{ - std::ostringstream tmp; - int code = e.value(); - char errbuf[120]; - - const char *message = ERR_error_string(code, errbuf); - - if (!message) - message = "Unknown error."; - - tmp << code << ", \"" << message << "\""; - return "[errinfo_openssl_error]" + tmp.str() + "\n"; -} +std::string to_string(const errinfo_openssl_error& e); } diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index f8247bb7e..a18c9818b 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -299,3 +299,18 @@ size_t WorkQueue::GetTaskCount(RingBuffer::SizeType span) boost::mutex::scoped_lock lock(m_StatsMutex); return m_TaskStats.UpdateAndGetValues(Utility::GetTime(), span); } + +bool icinga::operator<(const Task& a, const Task& b) +{ + if (a.Priority < b.Priority) + return true; + + if (a.Priority == b.Priority) { + if (a.ID > b.ID) + return true; + else + return false; + } + + return false; +} diff --git a/lib/base/workqueue.hpp b/lib/base/workqueue.hpp index 955651b4a..14d0dd5fb 100644 --- a/lib/base/workqueue.hpp +++ b/lib/base/workqueue.hpp @@ -54,20 +54,7 @@ struct Task int ID{-1}; }; -inline bool operator<(const Task& a, const Task& b) -{ - if (a.Priority < b.Priority) - return true; - - if (a.Priority == b.Priority) { - if (a.ID > b.ID) - return true; - else - return false; - } - - return false; -} +bool operator<(const Task& a, const Task& b); /** * A workqueue. From 71ee5ac698f8f06e7d58dfa54fb69a5804bcc1f4 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 10:46:35 +0100 Subject: [PATCH 12/12] Build fix --- lib/base/object.cpp | 2 +- lib/base/perfdatavalue.cpp | 3 --- lib/base/process.cpp | 16 +++++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/base/object.cpp b/lib/base/object.cpp index 51a850d37..fe91de5ac 100644 --- a/lib/base/object.cpp +++ b/lib/base/object.cpp @@ -67,7 +67,7 @@ bool Object::OwnsLock() const return (tid == GetCurrentThreadId()); #else /* _WIN32 */ - pthread_t tid = __sync_fetch_and_add(&m_LockOwner, nullptr); + pthread_t tid = __sync_fetch_and_add(&m_LockOwner, 0); return (tid == pthread_self()); #endif /* _WIN32 */ diff --git a/lib/base/perfdatavalue.cpp b/lib/base/perfdatavalue.cpp index 2c2829112..407f757f7 100644 --- a/lib/base/perfdatavalue.cpp +++ b/lib/base/perfdatavalue.cpp @@ -32,9 +32,6 @@ using namespace icinga; REGISTER_TYPE(PerfdataValue); REGISTER_SCRIPTFUNCTION_NS(System, parse_performance_data, PerfdataValue::Parse, "perfdata"); -PerfdataValue::PerfdataValue() -{ } - PerfdataValue::PerfdataValue(const String& label, double value, bool counter, const String& unit, const Value& warn, const Value& crit, const Value& min, const Value& max) diff --git a/lib/base/process.cpp b/lib/base/process.cpp index fbd7d1928..4f87ab3b5 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -506,22 +506,24 @@ void Process::InitializeSpawnHelper() static void InitializeProcess() { - for (auto& l_EventFD : l_EventFDs) { #ifdef _WIN32 - l_Events[tid] = CreateEvent(nullptr, TRUE, FALSE, nullptr); + for (auto& event : l_Events) { + event = CreateEvent(nullptr, TRUE, FALSE, nullptr); + } #else /* _WIN32 */ + for (auto& eventFD : l_EventFDs) { # ifdef HAVE_PIPE2 - if (pipe2(l_EventFDs[tid], O_CLOEXEC) < 0) { + if (pipe2(eventFD, O_CLOEXEC) < 0) { if (errno == ENOSYS) { # endif /* HAVE_PIPE2 */ - if (pipe(l_EventFD) < 0) { + if (pipe(eventFD) < 0) { BOOST_THROW_EXCEPTION(posix_error() << boost::errinfo_api_function("pipe") << boost::errinfo_errno(errno)); } - Utility::SetCloExec(l_EventFD[0]); - Utility::SetCloExec(l_EventFD[1]); + Utility::SetCloExec(eventFD[0]); + Utility::SetCloExec(eventFD[1]); # ifdef HAVE_PIPE2 } else { BOOST_THROW_EXCEPTION(posix_error() @@ -530,8 +532,8 @@ static void InitializeProcess() } } # endif /* HAVE_PIPE2 */ -#endif /* _WIN32 */ } +#endif /* _WIN32 */ } INITIALIZE_ONCE(InitializeProcess);