Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / statustable.cpp

diff --git a/lib/livestatus/statustable.cpp b/lib/livestatus/statustable.cpp
index 93ce52e95d920cd3f74e6f2b0c4050c5aeaf43b8..135e15e99878562aef0aec2d0494899ff6413bbd 100644 (file)
--- a/lib/livestatus/statustable.cpp
+++ b/lib/livestatus/statustable.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -29,13 +29,13 @@
 
 using namespace icinga;
 
-StatusTable::StatusTable(void)
+StatusTable::StatusTable()
 {
        AddColumns(this);
 }
 
 void StatusTable::AddColumns(Table *table, const String& prefix,
-    const Column::ObjectAccessor& objectAccessor)
+       const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "neb_callbacks", Column(&Table::ZeroAccessor, objectAccessor));
        table->AddColumn(prefix + "neb_callbacks_rate", Column(&Table::ZeroAccessor, objectAccessor));
@@ -102,12 +102,12 @@ void StatusTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "custom_variables", Column(&StatusTable::CustomVariablesAccessor, objectAccessor));
 }
 
-String StatusTable::GetName(void) const
+String StatusTable::GetName() const
 {
        return "status";
 }
 
-String StatusTable::GetPrefix(void) const
+String StatusTable::GetPrefix() const
 {
        return "status";
 }
@@ -132,25 +132,25 @@ Value StatusTable::ConnectionsRateAccessor(const Value&)
 
 Value StatusTable::HostChecksAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return CIB::GetActiveHostChecksStatistics(timespan);
 }
 
 Value StatusTable::HostChecksRateAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return (CIB::GetActiveHostChecksStatistics(timespan) / (Utility::GetTime() - Application::GetStartTime()));
 }
 
 Value StatusTable::ServiceChecksAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return CIB::GetActiveServiceChecksStatistics(timespan);
 }
 
 Value StatusTable::ServiceChecksRateAccessor(const Value&)
 {
-       long timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
+       auto timespan = static_cast<long>(Utility::GetTime() - Application::GetStartTime());
        return (CIB::GetActiveServiceChecksStatistics(timespan) / (Utility::GetTime() - Application::GetStartTime()));
 }
 
@@ -233,11 +233,11 @@ Value StatusTable::CustomVariableNamesAccessor(const Value&)
 {
        Dictionary::Ptr vars = IcingaApplication::GetInstance()->GetVars();
 
-       if (!vars)
-               return Empty;
-
        Array::Ptr cv = new Array();
 
+       if (!vars)
+               return cv;
+
        {
                ObjectLock olock(vars);
                for (const auto& kv : vars) {
@@ -252,11 +252,11 @@ Value StatusTable::CustomVariableValuesAccessor(const Value&)
 {
        Dictionary::Ptr vars = IcingaApplication::GetInstance()->GetVars();
 
-       if (!vars)
-               return Empty;
-
        Array::Ptr cv = new Array();
 
+       if (!vars)
+               return cv;
+
        {
                ObjectLock olock(vars);
                for (const auto& kv : vars) {
@@ -271,11 +271,11 @@ Value StatusTable::CustomVariablesAccessor(const Value&)
 {
        Dictionary::Ptr vars = IcingaApplication::GetInstance()->GetVars();
 
-       if (!vars)
-               return Empty;
-
        Array::Ptr cv = new Array();
 
+       if (!vars)
+               return cv;
+
        {
                ObjectLock olock(vars);
                for (const auto& kv : vars) {