diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp index 2d283a1aa..e6a361dc5 100644 --- a/icinga-app/icinga.cpp +++ b/icinga-app/icinga.cpp @@ -924,6 +924,8 @@ int main(int argc, char **argv) #ifdef I2_DEBUG if (rc >= 0) std::cerr << "Closed FD " << i << " which we inherited from our parent process." << std::endl; +#else /* I2_DEBUG */ + (void)rc; #endif /* I2_DEBUG */ } } diff --git a/lib/base/application.cpp b/lib/base/application.cpp index 11f256bce..7806a39cb 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -162,7 +162,7 @@ void Application::SetResourceLimits() rlim_t fileLimit = Configuration::RLimitFiles; if (fileLimit != 0) { - if (fileLimit < GetDefaultRLimitFiles()) { + if (fileLimit < (rlim_t)GetDefaultRLimitFiles()) { Log(LogWarning, "Application") << "The user-specified value for RLimitFiles cannot be smaller than the default value (" << GetDefaultRLimitFiles() << "). Using the default value instead."; fileLimit = GetDefaultRLimitFiles(); @@ -183,7 +183,7 @@ void Application::SetResourceLimits() rlim_t processLimit = Configuration::RLimitProcesses; if (processLimit != 0) { - if (processLimit < GetDefaultRLimitProcesses()) { + if (processLimit < (rlim_t)GetDefaultRLimitProcesses()) { Log(LogWarning, "Application") << "The user-specified value for RLimitProcesses cannot be smaller than the default value (" << GetDefaultRLimitProcesses() << "). Using the default value instead."; processLimit = GetDefaultRLimitProcesses(); @@ -222,7 +222,7 @@ void Application::SetResourceLimits() stackLimit = Configuration::RLimitStack; if (stackLimit != 0) { - if (stackLimit < GetDefaultRLimitStack()) { + if (stackLimit < (rlim_t)GetDefaultRLimitStack()) { Log(LogWarning, "Application") << "The user-specified value for RLimitStack cannot be smaller than the default value (" << GetDefaultRLimitStack() << "). Using the default value instead."; stackLimit = GetDefaultRLimitStack(); diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp index 6e3b8a1fc..7fad3453c 100644 --- a/lib/base/netstring.cpp +++ b/lib/base/netstring.cpp @@ -68,7 +68,7 @@ StreamReadStatus NetString::ReadStringFromStream(const Stream::Ptr& stream, Stri /* read the whole message */ size_t data_length = len + 1; - if (maxMessageLength >= 0 && data_length > maxMessageLength) { + if (maxMessageLength >= 0 && data_length > (size_t)maxMessageLength) { std::stringstream errorMessage; errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB"; diff --git a/lib/base/process.cpp b/lib/base/process.cpp index 497cca352..b96a65690 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -147,8 +147,11 @@ static Value ProcessSpawnImpl(struct msghdr *msgh, const Dictionary::Ptr& reques (void)close(fds[2]); #ifdef HAVE_NICE - if (adjustPriority) - (void)nice(5); + if (adjustPriority) { + // Cheating the compiler on "warning: ignoring return value of 'int nice(int)', declared with attribute warn_unused_result [-Wunused-result]". + auto x (nice(5)); + (void)x; + } #endif /* HAVE_NICE */ sigset_t mask; diff --git a/lib/base/scriptframe.cpp b/lib/base/scriptframe.cpp index fef3b7c99..7510c8a11 100644 --- a/lib/base/scriptframe.cpp +++ b/lib/base/scriptframe.cpp @@ -73,6 +73,10 @@ ScriptFrame::~ScriptFrame() { ScriptFrame *frame = PopFrame(); ASSERT(frame == this); + +#ifndef I2_DEBUG + (void)frame; +#endif /* I2_DEBUG */ } void ScriptFrame::IncreaseStackDepth() diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp index 9cd6ffb13..e35aa3567 100644 --- a/lib/cli/consolecommand.cpp +++ b/lib/cli/consolecommand.cpp @@ -459,15 +459,15 @@ incomplete: std::vector ulines = text.Split("\n"); - for (int i = 1; i <= ulines.size(); i++) { + for (decltype(ulines.size()) i = 1; i <= ulines.size(); i++) { int start, len; - if (i == di.FirstLine) + if (i == (decltype(i))di.FirstLine) start = di.FirstColumn; else start = 0; - if (i == di.LastLine) + if (i == (decltype(i))di.LastLine) len = di.LastColumn - di.FirstColumn + 1; else len = ulines[i - 1].GetLength(); @@ -480,7 +480,7 @@ incomplete: } else offset = 4; - if (i >= di.FirstLine && i <= di.LastLine) { + if (i >= (decltype(i))di.FirstLine && i <= (decltype(i))di.LastLine) { std::cout << String(di.Path.GetLength() + offset, ' '); std::cout << String(start, ' ') << String(len, '^') << "\n"; } diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp index 82ba04289..e250b19b8 100644 --- a/lib/cli/nodesetupcommand.cpp +++ b/lib/cli/nodesetupcommand.cpp @@ -153,7 +153,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v if (vm.count("global_zones")) setupGlobalZones = vm["global_zones"].as >(); - for (int i = 0; i < setupGlobalZones.size(); i++) { + for (decltype(setupGlobalZones.size()) i = 0; i < setupGlobalZones.size(); i++) { if (std::find(globalZones.begin(), globalZones.end(), setupGlobalZones[i]) != globalZones.end()) { Log(LogCritical, "cli") << "The global zone '" << setupGlobalZones[i] << "' is already specified."; @@ -505,7 +505,7 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm, if (vm.count("global_zones")) setupGlobalZones = vm["global_zones"].as >(); - for (int i = 0; i < setupGlobalZones.size(); i++) { + for (decltype(setupGlobalZones.size()) i = 0; i < setupGlobalZones.size(); i++) { if (std::find(globalZones.begin(), globalZones.end(), setupGlobalZones[i]) != globalZones.end()) { Log(LogCritical, "cli") << "The global zone '" << setupGlobalZones[i] << "' is already specified."; diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp index a599a1c15..5874088ac 100644 --- a/lib/icinga/legacytimeperiod.cpp +++ b/lib/icinga/legacytimeperiod.cpp @@ -391,7 +391,7 @@ Dictionary::Ptr LegacyTimePeriod::FindRunningSegment(const String& daydef, const ProcessTimeRanges(timeranges, &iter, segments); Dictionary::Ptr bestSegment; - double bestEnd; + double bestEnd = 0.0; ObjectLock olock(segments); for (const Dictionary::Ptr& segment : segments) { diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp index 113f9fc4c..6642841f4 100644 --- a/lib/icinga/scheduleddowntime.cpp +++ b/lib/icinga/scheduleddowntime.cpp @@ -119,7 +119,7 @@ std::pair ScheduledDowntime::FindRunningSegment(double minEnd) Array::Ptr segments = new Array(); Dictionary::Ptr bestSegment; - double bestBegin, bestEnd; + double bestBegin = 0.0, bestEnd = 0.0; double now = Utility::GetTime(); ObjectLock olock(ranges); @@ -179,7 +179,7 @@ std::pair ScheduledDowntime::FindNextSegment() Array::Ptr segments = new Array(); Dictionary::Ptr bestSegment; - double bestBegin, bestEnd; + double bestBegin = 0.0, bestEnd = 0.0; double now = Utility::GetTime(); ObjectLock olock(ranges); diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 16acdeddf..63c1e509c 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -1408,7 +1408,7 @@ bool ApiListener::AddAnonymousClient(const JsonRpcConnection::Ptr& aclient) { boost::mutex::scoped_lock lock(m_AnonymousClientsLock); - if (GetMaxAnonymousClients() >= 0 && m_AnonymousClients.size() + 1 > GetMaxAnonymousClients()) + if (GetMaxAnonymousClients() >= 0 && (long)m_AnonymousClients.size() + 1 > (long)GetMaxAnonymousClients()) return false; m_AnonymousClients.insert(aclient); diff --git a/lib/remote/eventqueue.cpp b/lib/remote/eventqueue.cpp index 0d251f1d9..20c4af688 100644 --- a/lib/remote/eventqueue.cpp +++ b/lib/remote/eventqueue.cpp @@ -48,6 +48,10 @@ void EventQueue::AddClient(void *client) auto result = m_Events.insert(std::make_pair(client, std::deque())); ASSERT(result.second); + +#ifndef I2_DEBUG + (void)result; +#endif /* I2_DEBUG */ } void EventQueue::RemoveClient(void *client)