tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 06:05:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10442 from Icinga/jschmidt/fix-compiler-warnings

Browse Source 
Fix two low-hanging fruit compiler warnings
This commit is contained in:
Yonas Habteab 2025-05-19 14:40:55 +02:00 committed by GitHub
commit 44b3382f5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/comment.ti
View File

@ -24,8 +24,8 @@ enum CommentType
class CommentNameComposer : public NameComposer class CommentNameComposer : public NameComposer
{ {
public: public:
virtual String MakeName(const String& shortName, const Object::Ptr& context) const; virtual String MakeName(const String& shortName, const Object::Ptr& context) const override;
virtual Dictionary::Ptr ParseName(const String& name) const; virtual Dictionary::Ptr ParseName(const String& name) const override;
}; };
}}} }}}

4
lib/icinga/dependency.ti
View File

@ -13,8 +13,8 @@ code {{{
class DependencyNameComposer : public NameComposer class DependencyNameComposer : public NameComposer
{ {
public: public:
virtual String MakeName(const String& shortName, const Object::Ptr& context) const; virtual String MakeName(const String& shortName, const Object::Ptr& context) const override;
virtual Dictionary::Ptr ParseName(const String& name) const; virtual Dictionary::Ptr ParseName(const String& name) const override;
}; };
}}} }}}

4
lib/icinga/downtime.ti
View File

@ -13,8 +13,8 @@ code {{{
class DowntimeNameComposer : public NameComposer class DowntimeNameComposer : public NameComposer
{ {
public: public:
virtual String MakeName(const String& shortName, const Object::Ptr& context) const; virtual String MakeName(const String& shortName, const Object::Ptr& context) const override;
virtual Dictionary::Ptr ParseName(const String& name) const; virtual Dictionary::Ptr ParseName(const String& name) const override;
}; };
}}} }}}

6
lib/icinga/notification.cpp
View File

@ -472,7 +472,8 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
if (type == NotificationProblem && !reminder && !checkable->GetVolatile()) { if (type == NotificationProblem && !reminder && !checkable->GetVolatile()) {
auto [host, service] = GetHostService(checkable); auto [host, service] = GetHostService(checkable);
uint_fast8_t state = service ? service->GetState() : host->GetState(); uint_fast8_t state = service ? static_cast<uint_fast8_t>(service->GetState())
: static_cast<uint_fast8_t>(host->GetState());
if (state == (uint_fast8_t)GetLastNotifiedStatePerUser()->Get(userName)) { if (state == (uint_fast8_t)GetLastNotifiedStatePerUser()->Get(userName)) {
auto stateStr (service ? NotificationServiceStateToString(service->GetState()) : NotificationHostStateToString(host->GetState())); auto stateStr (service ? NotificationServiceStateToString(service->GetState()) : NotificationHostStateToString(host->GetState()));
@ -501,7 +502,8 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
if (type == NotificationProblem) { if (type == NotificationProblem) {
auto [host, service] = GetHostService(checkable); auto [host, service] = GetHostService(checkable);
uint_fast8_t state = service ? service->GetState() : host->GetState(); uint_fast8_t state = service ? static_cast<uint_fast8_t>(service->GetState())
: static_cast<uint_fast8_t>(host->GetState());
if (state != (uint_fast8_t)GetLastNotifiedStatePerUser()->Get(userName)) { if (state != (uint_fast8_t)GetLastNotifiedStatePerUser()->Get(userName)) {
GetLastNotifiedStatePerUser()->Set(userName, state); GetLastNotifiedStatePerUser()->Set(userName, state);

4
lib/icinga/notification.ti
View File

@ -13,8 +13,8 @@ code {{{
class NotificationNameComposer : public NameComposer class NotificationNameComposer : public NameComposer
{ {
public: public:
virtual String MakeName(const String& shortName, const Object::Ptr& context) const; virtual String MakeName(const String& shortName, const Object::Ptr& context) const override;
virtual Dictionary::Ptr ParseName(const String& name) const; virtual Dictionary::Ptr ParseName(const String& name) const override;
}; };
}}} }}}

4
lib/icinga/scheduleddowntime.ti
View File

@ -12,8 +12,8 @@ code {{{
class ScheduledDowntimeNameComposer : public NameComposer class ScheduledDowntimeNameComposer : public NameComposer
{ {
public: public:
virtual String MakeName(const String& shortName, const Object::Ptr& context) const; virtual String MakeName(const String& shortName, const Object::Ptr& context) const override;
virtual Dictionary::Ptr ParseName(const String& name) const; virtual Dictionary::Ptr ParseName(const String& name) const override;
}; };
}}} }}}

4
lib/icinga/service.ti
View File

@ -15,8 +15,8 @@ code {{{
class ServiceNameComposer : public NameComposer class ServiceNameComposer : public NameComposer
{ {
public: public:
virtual String MakeName(const String& shortName, const Object::Ptr& context) const; virtual String MakeName(const String& shortName, const Object::Ptr& context) const override;
virtual Dictionary::Ptr ParseName(const String& name) const; virtual Dictionary::Ptr ParseName(const String& name) const override;
}; };
}}} }}}

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

@ -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),