Skip to content

Commit 646c526

Browse files
Al2KlimovAl2Klimov
committed
Silence compiler warnings about unused parameters
Every of these parameters exists for a reason. The best we can do is to convince the compiler.
1 parent 519da9c commit 646c526

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+167
-162
lines changed

‎lib/base/configobject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ void ConfigObject::OnAllConfigLoaded()
421421
m_Zone = ctype->GetObject(zoneName);
422422
}
423423

424-
void ConfigObject::CreateChildObjects(const Type::Ptr& childType)
424+
void ConfigObject::CreateChildObjects(const Type::Ptr&)
425425
{
426426
/* Nothing to do here. */
427427
}

‎lib/base/configuration.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ String Configuration::GetApiBindHost() const
7272
return Configuration::ApiBindHost;
7373
}
7474

75-
void Configuration::SetApiBindHost(const String& val, bool suppress_events, const Value& cookie)
75+
void Configuration::SetApiBindHost(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
7676
{
7777
HandleUserWrite("ApiBindHost", &Configuration::ApiBindHost, val, m_ReadOnly);
7878
}
@@ -82,7 +82,7 @@ String Configuration::GetApiBindPort() const
8282
return Configuration::ApiBindPort;
8383
}
8484

85-
void Configuration::SetApiBindPort(const String& val, bool suppress_events, const Value& cookie)
85+
void Configuration::SetApiBindPort(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
8686
{
8787
HandleUserWrite("ApiBindPort", &Configuration::ApiBindPort, val, m_ReadOnly);
8888
}
@@ -92,7 +92,7 @@ bool Configuration::GetAttachDebugger() const
9292
return Configuration::AttachDebugger;
9393
}
9494

95-
void Configuration::SetAttachDebugger(bool val, bool suppress_events, const Value& cookie)
95+
void Configuration::SetAttachDebugger(bool val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
9696
{
9797
HandleUserWrite("AttachDebugger", &Configuration::AttachDebugger, val, m_ReadOnly);
9898
}
@@ -102,7 +102,7 @@ String Configuration::GetCacheDir() const
102102
return Configuration::CacheDir;
103103
}
104104

105-
void Configuration::SetCacheDir(const String& val, bool suppress_events, const Value& cookie)
105+
void Configuration::SetCacheDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
106106
{
107107
HandleUserWrite("CacheDir", &Configuration::CacheDir, val, m_ReadOnly);
108108
}
@@ -112,7 +112,7 @@ int Configuration::GetConcurrency() const
112112
return Configuration::Concurrency;
113113
}
114114

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

126-
void Configuration::SetConfigDir(const String& val, bool suppress_events, const Value& cookie)
126+
void Configuration::SetConfigDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
127127
{
128128
HandleUserWrite("ConfigDir", &Configuration::ConfigDir, val, m_ReadOnly);
129129
}
@@ -133,7 +133,7 @@ String Configuration::GetDataDir() const
133133
return Configuration::DataDir;
134134
}
135135

136-
void Configuration::SetDataDir(const String& val, bool suppress_events, const Value& cookie)
136+
void Configuration::SetDataDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
137137
{
138138
HandleUserWrite("DataDir", &Configuration::DataDir, val, m_ReadOnly);
139139
}
@@ -143,7 +143,7 @@ String Configuration::GetEventEngine() const
143143
return Configuration::EventEngine;
144144
}
145145

146-
void Configuration::SetEventEngine(const String& val, bool suppress_events, const Value& cookie)
146+
void Configuration::SetEventEngine(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
147147
{
148148
HandleUserWrite("EventEngine", &Configuration::EventEngine, val, m_ReadOnly);
149149
}
@@ -153,7 +153,7 @@ String Configuration::GetIncludeConfDir() const
153153
return Configuration::IncludeConfDir;
154154
}
155155

156-
void Configuration::SetIncludeConfDir(const String& val, bool suppress_events, const Value& cookie)
156+
void Configuration::SetIncludeConfDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
157157
{
158158
HandleUserWrite("IncludeConfDir", &Configuration::IncludeConfDir, val, m_ReadOnly);
159159
}
@@ -163,7 +163,7 @@ String Configuration::GetInitRunDir() const
163163
return Configuration::InitRunDir;
164164
}
165165

166-
void Configuration::SetInitRunDir(const String& val, bool suppress_events, const Value& cookie)
166+
void Configuration::SetInitRunDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
167167
{
168168
HandleUserWrite("InitRunDir", &Configuration::InitRunDir, val, m_ReadOnly);
169169
}
@@ -173,7 +173,7 @@ String Configuration::GetLogDir() const
173173
return Configuration::LogDir;
174174
}
175175

176-
void Configuration::SetLogDir(const String& val, bool suppress_events, const Value& cookie)
176+
void Configuration::SetLogDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
177177
{
178178
HandleUserWrite("LogDir", &Configuration::LogDir, val, m_ReadOnly);
179179
}
@@ -183,7 +183,7 @@ String Configuration::GetModAttrPath() const
183183
return Configuration::ModAttrPath;
184184
}
185185

186-
void Configuration::SetModAttrPath(const String& val, bool suppress_events, const Value& cookie)
186+
void Configuration::SetModAttrPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
187187
{
188188
HandleUserWrite("ModAttrPath", &Configuration::ModAttrPath, val, m_ReadOnly);
189189
}
@@ -193,7 +193,7 @@ String Configuration::GetObjectsPath() const
193193
return Configuration::ObjectsPath;
194194
}
195195

196-
void Configuration::SetObjectsPath(const String& val, bool suppress_events, const Value& cookie)
196+
void Configuration::SetObjectsPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
197197
{
198198
HandleUserWrite("ObjectsPath", &Configuration::ObjectsPath, val, m_ReadOnly);
199199
}
@@ -203,7 +203,7 @@ String Configuration::GetPidPath() const
203203
return Configuration::PidPath;
204204
}
205205

206-
void Configuration::SetPidPath(const String& val, bool suppress_events, const Value& cookie)
206+
void Configuration::SetPidPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
207207
{
208208
HandleUserWrite("PidPath", &Configuration::PidPath, val, m_ReadOnly);
209209
}
@@ -213,7 +213,7 @@ String Configuration::GetPkgDataDir() const
213213
return Configuration::PkgDataDir;
214214
}
215215

216-
void Configuration::SetPkgDataDir(const String& val, bool suppress_events, const Value& cookie)
216+
void Configuration::SetPkgDataDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
217217
{
218218
HandleUserWrite("PkgDataDir", &Configuration::PkgDataDir, val, m_ReadOnly);
219219
}
@@ -223,7 +223,7 @@ String Configuration::GetPrefixDir() const
223223
return Configuration::PrefixDir;
224224
}
225225

226-
void Configuration::SetPrefixDir(const String& val, bool suppress_events, const Value& cookie)
226+
void Configuration::SetPrefixDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
227227
{
228228
HandleUserWrite("PrefixDir", &Configuration::PrefixDir, val, m_ReadOnly);
229229
}
@@ -233,7 +233,7 @@ String Configuration::GetProgramData() const
233233
return Configuration::ProgramData;
234234
}
235235

236-
void Configuration::SetProgramData(const String& val, bool suppress_events, const Value& cookie)
236+
void Configuration::SetProgramData(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
237237
{
238238
HandleUserWrite("ProgramData", &Configuration::ProgramData, val, m_ReadOnly);
239239
}
@@ -243,7 +243,7 @@ int Configuration::GetRLimitFiles() const
243243
return Configuration::RLimitFiles;
244244
}
245245

246-
void Configuration::SetRLimitFiles(int val, bool suppress_events, const Value& cookie)
246+
void Configuration::SetRLimitFiles(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
247247
{
248248
HandleUserWrite("RLimitFiles", &Configuration::RLimitFiles, val, m_ReadOnly);
249249
}
@@ -253,7 +253,7 @@ int Configuration::GetRLimitProcesses() const
253253
return RLimitProcesses;
254254
}
255255

256-
void Configuration::SetRLimitProcesses(int val, bool suppress_events, const Value& cookie)
256+
void Configuration::SetRLimitProcesses(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
257257
{
258258
HandleUserWrite("RLimitProcesses", &Configuration::RLimitProcesses, val, m_ReadOnly);
259259
}
@@ -263,7 +263,7 @@ int Configuration::GetRLimitStack() const
263263
return Configuration::RLimitStack;
264264
}
265265

266-
void Configuration::SetRLimitStack(int val, bool suppress_events, const Value& cookie)
266+
void Configuration::SetRLimitStack(int val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
267267
{
268268
HandleUserWrite("RLimitStack", &Configuration::RLimitStack, val, m_ReadOnly);
269269
}
@@ -273,7 +273,7 @@ String Configuration::GetRunAsGroup() const
273273
return Configuration::RunAsGroup;
274274
}
275275

276-
void Configuration::SetRunAsGroup(const String& val, bool suppress_events, const Value& cookie)
276+
void Configuration::SetRunAsGroup(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
277277
{
278278
HandleUserWrite("RunAsGroup", &Configuration::RunAsGroup, val, m_ReadOnly);
279279
}
@@ -283,7 +283,7 @@ String Configuration::GetRunAsUser() const
283283
return Configuration::RunAsUser;
284284
}
285285

286-
void Configuration::SetRunAsUser(const String& val, bool suppress_events, const Value& cookie)
286+
void Configuration::SetRunAsUser(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
287287
{
288288
HandleUserWrite("RunAsUser", &Configuration::RunAsUser, val, m_ReadOnly);
289289
}
@@ -293,7 +293,7 @@ String Configuration::GetSpoolDir() const
293293
return Configuration::SpoolDir;
294294
}
295295

296-
void Configuration::SetSpoolDir(const String& val, bool suppress_events, const Value& cookie)
296+
void Configuration::SetSpoolDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
297297
{
298298
HandleUserWrite("SpoolDir", &Configuration::SpoolDir, val, m_ReadOnly);
299299
}
@@ -303,7 +303,7 @@ String Configuration::GetStatePath() const
303303
return Configuration::StatePath;
304304
}
305305

306-
void Configuration::SetStatePath(const String& val, bool suppress_events, const Value& cookie)
306+
void Configuration::SetStatePath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
307307
{
308308
HandleUserWrite("StatePath", &Configuration::StatePath, val, m_ReadOnly);
309309
}
@@ -313,7 +313,7 @@ double Configuration::GetTlsHandshakeTimeout() const
313313
return Configuration::TlsHandshakeTimeout;
314314
}
315315

316-
void Configuration::SetTlsHandshakeTimeout(double val, bool suppress_events, const Value& cookie)
316+
void Configuration::SetTlsHandshakeTimeout(double val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
317317
{
318318
HandleUserWrite("TlsHandshakeTimeout", &Configuration::TlsHandshakeTimeout, val, m_ReadOnly);
319319
}
@@ -323,7 +323,7 @@ String Configuration::GetVarsPath() const
323323
return Configuration::VarsPath;
324324
}
325325

326-
void Configuration::SetVarsPath(const String& val, bool suppress_events, const Value& cookie)
326+
void Configuration::SetVarsPath(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
327327
{
328328
HandleUserWrite("VarsPath", &Configuration::VarsPath, val, m_ReadOnly);
329329
}
@@ -333,7 +333,7 @@ String Configuration::GetZonesDir() const
333333
return Configuration::ZonesDir;
334334
}
335335

336-
void Configuration::SetZonesDir(const String& val, bool suppress_events, const Value& cookie)
336+
void Configuration::SetZonesDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
337337
{
338338
HandleUserWrite("ZonesDir", &Configuration::ZonesDir, val, m_ReadOnly);
339339
}
@@ -343,7 +343,7 @@ String Configuration::GetLocalStateDir() const
343343
return Configuration::LocalStateDir;
344344
}
345345

346-
void Configuration::SetLocalStateDir(const String& val, bool suppress_events, const Value& cookie)
346+
void Configuration::SetLocalStateDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
347347
{
348348
HandleUserWrite("LocalStateDir", &Configuration::LocalStateDir, val, m_ReadOnly);
349349
}
@@ -353,7 +353,7 @@ String Configuration::GetSysconfDir() const
353353
return Configuration::SysconfDir;
354354
}
355355

356-
void Configuration::SetSysconfDir(const String& val, bool suppress_events, const Value& cookie)
356+
void Configuration::SetSysconfDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
357357
{
358358
HandleUserWrite("SysconfDir", &Configuration::SysconfDir, val, m_ReadOnly);
359359
}
@@ -363,7 +363,7 @@ String Configuration::GetRunDir() const
363363
return Configuration::RunDir;
364364
}
365365

366-
void Configuration::SetRunDir(const String& val, bool suppress_events, const Value& cookie)
366+
void Configuration::SetRunDir(const String& val, [[maybe_unused]] bool suppress_events, [[maybe_unused]] const Value& cookie)
367367
{
368368
HandleUserWrite("RunDir", &Configuration::RunDir, val, m_ReadOnly);
369369
}

‎lib/base/io-engine.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ IoEngine::IoEngine() : m_IoContext(), m_KeepAlive(boost::asio::make_work_guard(m
9797

9898
IoEngine::~IoEngine()
9999
{
100-
for (auto& thread : m_Threads) {
100+
for ([[maybe_unused]] auto& thread : m_Threads) {
101101
boost::asio::post(m_IoContext, []() {
102102
throw TerminateIoThread();
103103
});

‎lib/base/object.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,22 @@ void Object::SetFieldByName(const String& field, const Value& value, const Debug
150150
}
151151
}
152152

153-
void Object::Validate(int types, const ValidationUtils& utils)
153+
void Object::Validate([[maybe_unused]] int types, const ValidationUtils&)
154154
{
155155
/* Nothing to do here. */
156156
}
157157

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

163-
void Object::NotifyField(int id, const Value& cookie)
163+
void Object::NotifyField([[maybe_unused]] int id, [[maybe_unused]] const Value& cookie)
164164
{
165165
BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID."));
166166
}
167167

168-
Object::Ptr Object::NavigateField(int id) const
168+
Object::Ptr Object::NavigateField([[maybe_unused]] int id) const
169169
{
170170
BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID."));
171171
}

‎lib/base/scriptutils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ void ScriptUtils::Assert(const Value& arg)
508508
BOOST_THROW_EXCEPTION(std::runtime_error("Assertion failed"));
509509
}
510510

511-
String ScriptUtils::MsiGetComponentPathShim(const String& component)
511+
String ScriptUtils::MsiGetComponentPathShim([[maybe_unused]] const String& component)
512512
{
513513
#ifdef _WIN32
514514
TCHAR productCode[39];

‎lib/base/type.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ int Type::GetActivationPriority() const
202202
return 0;
203203
}
204204

205-
void Type::RegisterAttributeHandler(int fieldId, const AttributeHandler& callback)
205+
void Type::RegisterAttributeHandler([[maybe_unused]] int fieldId, const AttributeHandler&)
206206
{
207207
throw std::runtime_error("Invalid field ID.");
208208
}

‎lib/base/typetype-script.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static void TypeRegisterAttributeHandler(const String& fieldName, const Function
1515
REQUIRE_NOT_NULL(self);
1616

1717
int fid = self->GetFieldId(fieldName);
18-
self->RegisterAttributeHandler(fid, [callback](const Object::Ptr& object, const Value& cookie) {
18+
self->RegisterAttributeHandler(fid, [callback](const Object::Ptr& object, [[maybe_unused]] const Value& cookie) {
1919
callback->Invoke({ object });
2020
});
2121
}

‎lib/base/utility.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ static bool GlobHelper(const String& pathSpec, int type, std::vector<String>& fi
430430
#endif /* _WIN32 */
431431

432432
#ifndef _WIN32
433-
static int GlobErrorHandler(const char *epath, int eerrno)
433+
static int GlobErrorHandler([[maybe_unused]] const char *epath, int eerrno)
434434
{
435435
if (eerrno == ENOTDIR)
436436
return 0;

‎lib/cli/apisetupcommand.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ImpersonationLevel ApiSetupCommand::GetImpersonationLevel() const
2828
}
2929

3030
void ApiSetupCommand::InitParameters(boost::program_options::options_description& visibleDesc,
31-
boost::program_options::options_description& hiddenDesc) const
31+
[[maybe_unused]] boost::program_options::options_description& hiddenDesc) const
3232
{
3333
visibleDesc.add_options()
3434
("cn", po::value<std::string>(), "The certificate's common name");
@@ -39,7 +39,7 @@ void ApiSetupCommand::InitParameters(boost::program_options::options_description
3939
*
4040
* @returns An exit status.
4141
*/
42-
int ApiSetupCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
42+
int ApiSetupCommand::Run(const boost::program_options::variables_map& vm, [[maybe_unused]] const std::vector<std::string>& ap) const
4343
{
4444
String cn;
4545

‎lib/cli/calistcommand.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ String CAListCommand::GetShortDescription() const
4141
* @param hiddenDesc Register hidden parameters.
4242
*/
4343
void CAListCommand::InitParameters(boost::program_options::options_description& visibleDesc,
44-
boost::program_options::options_description& hiddenDesc) const
44+
[[maybe_unused]] boost::program_options::options_description& hiddenDesc) const
4545
{
4646
visibleDesc.add_options()
4747
("all", "List all certificate signing requests, including signed. Note: Old requests are automatically cleaned by Icinga after 1 week.")
@@ -54,7 +54,7 @@ void CAListCommand::InitParameters(boost::program_options::options_description&
5454
*
5555
* @return An exit status.
5656
*/
57-
int CAListCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
57+
int CAListCommand::Run(const boost::program_options::variables_map& vm, [[maybe_unused]] const std::vector<std::string>& ap) const
5858
{
5959
Dictionary::Ptr requests = PkiUtility::GetCertificateRequests(vm.count("removed"));
6060

0 commit comments

Comments
 (0)