tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-22 09:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Alexander A. Klimov 2023-03-24 18:08:20 +01:00
parent 8f2f9737d3
commit 5484ad23bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icingadb/icingadb-objects.cpp
View File

@ -1932,7 +1932,7 @@ unsigned short GetPreviousState(const Checkable::Ptr& checkable, const Service::
if (service) { if (service) {
return phs; return phs;
} else { } else {
return phs == 99 ? phs : Host::CalculateState(ServiceState(phs)); return phs == 99 ? phs : (unsigned short)Host::CalculateState(ServiceState(phs));
} }
} }
@ -2061,7 +2061,7 @@ void IcingaDB::SendSentNotification(
"host_id", GetObjectIdentifier(host), "host_id", GetObjectIdentifier(host),
"type", Convert::ToString(type), "type", Convert::ToString(type),
"state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetState()) : Convert::ToLong(Host::CalculateState(cr->GetState())) : 99), "state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetState()) : Convert::ToLong(Host::CalculateState(cr->GetState())) : 99),
"previous_hard_state", Convert::ToString(cr ? Convert::ToLong(service ? cr->GetPreviousHardState() : Host::CalculateState(cr->GetPreviousHardState())) : 99), "previous_hard_state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetPreviousHardState()) : Convert::ToLong(Host::CalculateState(cr->GetPreviousHardState())) : 99),
"author", Utility::ValidateUTF8(author), "author", Utility::ValidateUTF8(author),
"text", Utility::ValidateUTF8(finalText), "text", Utility::ValidateUTF8(finalText),
"users_notified", Convert::ToString(usersAmount), "users_notified", Convert::ToString(usersAmount),

2
lib/icingadb/redisconnection.cpp
View File

@ -224,7 +224,7 @@ void RedisConnection::EnqueueCallback(const std::function<void(boost::asio::yiel
auto ctime (Utility::GetTime()); auto ctime (Utility::GetTime());
asio::post(m_Strand, [this, callback, priority, ctime]() { asio::post(m_Strand, [this, callback, priority, ctime]() {
m_Queues.Writes[priority].emplace(WriteQueueItem{nullptr, nullptr, nullptr, nullptr, callback, ctime}); m_Queues.Writes[priority].emplace(WriteQueueItem{nullptr, nullptr, nullptr, nullptr, callback, ctime, QueryAffects{}});
m_QueuedWrites.Set(); m_QueuedWrites.Set();
}); });
} }