Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/base/configobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ void ConfigObject::OnAllConfigLoaded()
m_Zone = ctype->GetObject(zoneName);
}

void ConfigObject::CreateChildObjects(const Type::Ptr& childType)
void ConfigObject::CreateChildObjects(const Type::Ptr&)
{
/* Nothing to do here. */
}
Expand Down
60 changes: 30 additions & 30 deletions lib/base/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ String Configuration::GetApiBindHost() const
return Configuration::ApiBindHost;
}

void Configuration::SetApiBindHost(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetApiBindHost(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ApiBindHost", &Configuration::ApiBindHost, val, m_ReadOnly);
}
Expand All @@ -82,7 +82,7 @@ String Configuration::GetApiBindPort() const
return Configuration::ApiBindPort;
}

void Configuration::SetApiBindPort(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetApiBindPort(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ApiBindPort", &Configuration::ApiBindPort, val, m_ReadOnly);
}
Expand All @@ -92,7 +92,7 @@ bool Configuration::GetAttachDebugger() const
return Configuration::AttachDebugger;
}

void Configuration::SetAttachDebugger(bool val, bool suppress_events, const Value& cookie)
void Configuration::SetAttachDebugger(bool val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("AttachDebugger", &Configuration::AttachDebugger, val, m_ReadOnly);
}
Expand All @@ -102,7 +102,7 @@ String Configuration::GetCacheDir() const
return Configuration::CacheDir;
}

void Configuration::SetCacheDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetCacheDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("CacheDir", &Configuration::CacheDir, val, m_ReadOnly);
}
Expand All @@ -112,7 +112,7 @@ int Configuration::GetConcurrency() const
return Configuration::Concurrency;
}

void Configuration::SetConcurrency(int val, bool suppress_events, const Value& cookie)
void Configuration::SetConcurrency(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("Concurrency", &Configuration::Concurrency, val, m_ReadOnly);
Configuration::ConcurrencyWasModified = true;
Expand All @@ -123,7 +123,7 @@ String Configuration::GetConfigDir() const
return Configuration::ConfigDir;
}

void Configuration::SetConfigDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetConfigDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ConfigDir", &Configuration::ConfigDir, val, m_ReadOnly);
}
Expand All @@ -133,7 +133,7 @@ String Configuration::GetDataDir() const
return Configuration::DataDir;
}

void Configuration::SetDataDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetDataDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("DataDir", &Configuration::DataDir, val, m_ReadOnly);
}
Expand All @@ -143,7 +143,7 @@ String Configuration::GetEventEngine() const
return Configuration::EventEngine;
}

void Configuration::SetEventEngine(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetEventEngine(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("EventEngine", &Configuration::EventEngine, val, m_ReadOnly);
}
Expand All @@ -153,7 +153,7 @@ String Configuration::GetIncludeConfDir() const
return Configuration::IncludeConfDir;
}

void Configuration::SetIncludeConfDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetIncludeConfDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("IncludeConfDir", &Configuration::IncludeConfDir, val, m_ReadOnly);
}
Expand All @@ -163,7 +163,7 @@ String Configuration::GetInitRunDir() const
return Configuration::InitRunDir;
}

void Configuration::SetInitRunDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetInitRunDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("InitRunDir", &Configuration::InitRunDir, val, m_ReadOnly);
}
Expand All @@ -173,7 +173,7 @@ String Configuration::GetLogDir() const
return Configuration::LogDir;
}

void Configuration::SetLogDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetLogDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("LogDir", &Configuration::LogDir, val, m_ReadOnly);
}
Expand All @@ -183,7 +183,7 @@ String Configuration::GetModAttrPath() const
return Configuration::ModAttrPath;
}

void Configuration::SetModAttrPath(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetModAttrPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ModAttrPath", &Configuration::ModAttrPath, val, m_ReadOnly);
}
Expand All @@ -193,7 +193,7 @@ String Configuration::GetObjectsPath() const
return Configuration::ObjectsPath;
}

void Configuration::SetObjectsPath(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetObjectsPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ObjectsPath", &Configuration::ObjectsPath, val, m_ReadOnly);
}
Expand All @@ -203,7 +203,7 @@ String Configuration::GetPidPath() const
return Configuration::PidPath;
}

void Configuration::SetPidPath(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetPidPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("PidPath", &Configuration::PidPath, val, m_ReadOnly);
}
Expand All @@ -213,7 +213,7 @@ String Configuration::GetPkgDataDir() const
return Configuration::PkgDataDir;
}

void Configuration::SetPkgDataDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetPkgDataDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("PkgDataDir", &Configuration::PkgDataDir, val, m_ReadOnly);
}
Expand All @@ -223,7 +223,7 @@ String Configuration::GetPrefixDir() const
return Configuration::PrefixDir;
}

void Configuration::SetPrefixDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetPrefixDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("PrefixDir", &Configuration::PrefixDir, val, m_ReadOnly);
}
Expand All @@ -233,7 +233,7 @@ String Configuration::GetProgramData() const
return Configuration::ProgramData;
}

void Configuration::SetProgramData(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetProgramData(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ProgramData", &Configuration::ProgramData, val, m_ReadOnly);
}
Expand All @@ -243,7 +243,7 @@ int Configuration::GetRLimitFiles() const
return Configuration::RLimitFiles;
}

void Configuration::SetRLimitFiles(int val, bool suppress_events, const Value& cookie)
void Configuration::SetRLimitFiles(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("RLimitFiles", &Configuration::RLimitFiles, val, m_ReadOnly);
}
Expand All @@ -253,7 +253,7 @@ int Configuration::GetRLimitProcesses() const
return RLimitProcesses;
}

void Configuration::SetRLimitProcesses(int val, bool suppress_events, const Value& cookie)
void Configuration::SetRLimitProcesses(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("RLimitProcesses", &Configuration::RLimitProcesses, val, m_ReadOnly);
}
Expand All @@ -263,7 +263,7 @@ int Configuration::GetRLimitStack() const
return Configuration::RLimitStack;
}

void Configuration::SetRLimitStack(int val, bool suppress_events, const Value& cookie)
void Configuration::SetRLimitStack(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("RLimitStack", &Configuration::RLimitStack, val, m_ReadOnly);
}
Expand All @@ -273,7 +273,7 @@ String Configuration::GetRunAsGroup() const
return Configuration::RunAsGroup;
}

void Configuration::SetRunAsGroup(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetRunAsGroup(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("RunAsGroup", &Configuration::RunAsGroup, val, m_ReadOnly);
}
Expand All @@ -283,7 +283,7 @@ String Configuration::GetRunAsUser() const
return Configuration::RunAsUser;
}

void Configuration::SetRunAsUser(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetRunAsUser(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("RunAsUser", &Configuration::RunAsUser, val, m_ReadOnly);
}
Expand All @@ -293,7 +293,7 @@ String Configuration::GetSpoolDir() const
return Configuration::SpoolDir;
}

void Configuration::SetSpoolDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetSpoolDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("SpoolDir", &Configuration::SpoolDir, val, m_ReadOnly);
}
Expand All @@ -303,7 +303,7 @@ String Configuration::GetStatePath() const
return Configuration::StatePath;
}

void Configuration::SetStatePath(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetStatePath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("StatePath", &Configuration::StatePath, val, m_ReadOnly);
}
Expand All @@ -313,7 +313,7 @@ double Configuration::GetTlsHandshakeTimeout() const
return Configuration::TlsHandshakeTimeout;
}

void Configuration::SetTlsHandshakeTimeout(double val, bool suppress_events, const Value& cookie)
void Configuration::SetTlsHandshakeTimeout(double val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("TlsHandshakeTimeout", &Configuration::TlsHandshakeTimeout, val, m_ReadOnly);
}
Expand All @@ -323,7 +323,7 @@ String Configuration::GetVarsPath() const
return Configuration::VarsPath;
}

void Configuration::SetVarsPath(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetVarsPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("VarsPath", &Configuration::VarsPath, val, m_ReadOnly);
}
Expand All @@ -333,7 +333,7 @@ String Configuration::GetZonesDir() const
return Configuration::ZonesDir;
}

void Configuration::SetZonesDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetZonesDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("ZonesDir", &Configuration::ZonesDir, val, m_ReadOnly);
}
Expand All @@ -343,7 +343,7 @@ String Configuration::GetLocalStateDir() const
return Configuration::LocalStateDir;
}

void Configuration::SetLocalStateDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetLocalStateDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("LocalStateDir", &Configuration::LocalStateDir, val, m_ReadOnly);
}
Expand All @@ -353,7 +353,7 @@ String Configuration::GetSysconfDir() const
return Configuration::SysconfDir;
}

void Configuration::SetSysconfDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetSysconfDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("SysconfDir", &Configuration::SysconfDir, val, m_ReadOnly);
}
Expand All @@ -363,7 +363,7 @@ String Configuration::GetRunDir() const
return Configuration::RunDir;
}

void Configuration::SetRunDir(const String& val, bool suppress_events, const Value& cookie)
void Configuration::SetRunDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
{
HandleUserWrite("RunDir", &Configuration::RunDir, val, m_ReadOnly);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/base/io-engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ IoEngine::IoEngine() : m_IoContext(), m_KeepAlive(boost::asio::make_work_guard(m

IoEngine::~IoEngine()
{
for (auto& thread : m_Threads) {
for ([[maybe_unused]] auto& thread : m_Threads) {
boost::asio::post(m_IoContext, []() {
throw TerminateIoThread();
});
Expand Down
8 changes: 4 additions & 4 deletions lib/base/object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,22 +150,22 @@ void Object::SetFieldByName(const String& field, const Value& value, const Debug
}
}

void Object::Validate(int types, const ValidationUtils& utils)
void Object::Validate([[maybe_unused]] int types, const ValidationUtils&)
{
/* Nothing to do here. */
}

void Object::ValidateField(int id, const Lazy<Value>& lvalue, const ValidationUtils& utils)
void Object::ValidateField([[maybe_unused]] int id, const Lazy<Value>&, const ValidationUtils&)
{
/* Nothing to do here. */
}

void Object::NotifyField(int id, const Value& cookie)
void Object::NotifyField([[maybe_unused]] int id, [[maybe_unused]] const Value& cookie)
{
BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID."));
}

Object::Ptr Object::NavigateField(int id) const
Object::Ptr Object::NavigateField([[maybe_unused]] int id) const
{
BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID."));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/base/scriptutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ void ScriptUtils::Assert(const Value& arg)
BOOST_THROW_EXCEPTION(std::runtime_error("Assertion failed"));
}

String ScriptUtils::MsiGetComponentPathShim(const String& component)
String ScriptUtils::MsiGetComponentPathShim([[maybe_unused]] const String& component)
{
#ifdef _WIN32
TCHAR productCode[39];
Expand Down
2 changes: 1 addition & 1 deletion lib/base/type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ int Type::GetActivationPriority() const
return 0;
}

void Type::RegisterAttributeHandler(int fieldId, const AttributeHandler& callback)
void Type::RegisterAttributeHandler([[maybe_unused]] int fieldId, const AttributeHandler&)
{
throw std::runtime_error("Invalid field ID.");
}
Expand Down
2 changes: 1 addition & 1 deletion lib/base/typetype-script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ static void TypeRegisterAttributeHandler(const String& fieldName, const Function
REQUIRE_NOT_NULL(self);

int fid = self->GetFieldId(fieldName);
self->RegisterAttributeHandler(fid, [callback](const Object::Ptr& object, const Value& cookie) {
self->RegisterAttributeHandler(fid, [callback](const Object::Ptr& object, [[maybe_unused]] const Value& cookie) {
callback->Invoke({ object });
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/base/utility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ static bool GlobHelper(const String& pathSpec, int type, std::vector<String>& fi
#endif /* _WIN32 */

#ifndef _WIN32
static int GlobErrorHandler(const char *epath, int eerrno)
static int GlobErrorHandler([[maybe_unused]] const char *epath, int eerrno)
{
if (eerrno == ENOTDIR)
return 0;
Expand Down
4 changes: 2 additions & 2 deletions lib/cli/apisetupcommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ImpersonationLevel ApiSetupCommand::GetImpersonationLevel() const
}

void ApiSetupCommand::InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const
[[maybe_unused]] boost::program_options::options_description& hiddenDesc) const
{
visibleDesc.add_options()
("cn", po::value<std::string>(), "The certificate's common name");
Expand All @@ -39,7 +39,7 @@ void ApiSetupCommand::InitParameters(boost::program_options::options_description
*
* @returns An exit status.
*/
int ApiSetupCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
int ApiSetupCommand::Run(const boost::program_options::variables_map& vm, [[maybe_unused]] const std::vector<std::string>& ap) const
{
String cn;

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/calistcommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ String CAListCommand::GetShortDescription() const
* @param hiddenDesc Register hidden parameters.
*/
void CAListCommand::InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const
[[maybe_unused]] boost::program_options::options_description& hiddenDesc) const
{
visibleDesc.add_options()
("all", "List all certificate signing requests, including signed. Note: Old requests are automatically cleaned by Icinga after 1 week.")
Expand All @@ -54,7 +54,7 @@ void CAListCommand::InitParameters(boost::program_options::options_description&
*
* @return An exit status.
*/
int CAListCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
int CAListCommand::Run(const boost::program_options::variables_map& vm, [[maybe_unused]] const std::vector<std::string>& ap) const
{
Dictionary::Ptr requests = PkiUtility::GetCertificateRequests(vm.count("removed"));

Expand Down
2 changes: 1 addition & 1 deletion lib/cli/caremovecommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ImpersonationLevel CARemoveCommand::GetImpersonationLevel() const
*
* @returns An exit status.
*/
int CARemoveCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
int CARemoveCommand::Run(const boost::program_options::variables_map&, const std::vector<std::string>& ap) const
{
String fingerPrint = ap[0];
String requestFile = ApiListener::GetCertificateRequestsDir() + "/" + fingerPrint + ".json";
Expand Down
Loading
Loading