From e3c5063aff9cd684236fc88ead440d314ae70484 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 10 Nov 2014 09:52:27 +0100 Subject: [PATCH] Remove unused fields from the ObjectRule class refs #7622 --- lib/config/expression.cpp | 3 ++- lib/config/objectrule.cpp | 16 +++++----------- lib/config/objectrule.hpp | 8 +++----- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp index 6143354ed..b1514d70b 100644 --- a/lib/config/expression.cpp +++ b/lib/config/expression.cpp @@ -536,7 +536,8 @@ Value Expression::OpObject(const Expression* expr, const Object::Ptr& context, D item->SetZone(zone); item->Compile()->Register(); - ObjectRule::AddRule(type, name, exprl, filter, expr->m_DebugInfo, context); + if (ObjectRule::IsValidSourceType(type)) + ObjectRule::AddRule(type, name, filter, expr->m_DebugInfo, context); return Empty; } diff --git a/lib/config/objectrule.cpp b/lib/config/objectrule.cpp index 7fc03e3e5..1b2c1952b 100644 --- a/lib/config/objectrule.cpp +++ b/lib/config/objectrule.cpp @@ -26,9 +26,9 @@ using namespace icinga; ObjectRule::RuleMap ObjectRule::m_Rules; ObjectRule::CallbackMap ObjectRule::m_Callbacks; -ObjectRule::ObjectRule(const String& name, const Expression::Ptr& expression, - const Expression::Ptr& filter, const DebugInfo& di, const Object::Ptr& scope) - : m_Name(name), m_Expression(expression), m_Filter(filter), m_DebugInfo(di), m_Scope(scope) +ObjectRule::ObjectRule(const String& name, const Expression::Ptr& filter, + const DebugInfo& di, const Object::Ptr& scope) + : m_Name(name), m_Filter(filter), m_DebugInfo(di), m_Scope(scope) { } String ObjectRule::GetName(void) const @@ -36,11 +36,6 @@ String ObjectRule::GetName(void) const return m_Name; } -Expression::Ptr ObjectRule::GetExpression(void) const -{ - return m_Expression; -} - Expression::Ptr ObjectRule::GetFilter(void) const { return m_Filter; @@ -57,10 +52,9 @@ Object::Ptr ObjectRule::GetScope(void) const } void ObjectRule::AddRule(const String& sourceType, const String& name, - const Expression::Ptr& expression, const Expression::Ptr& filter, - const DebugInfo& di, const Object::Ptr& scope) + const Expression::Ptr& filter, const DebugInfo& di, const Object::Ptr& scope) { - m_Rules[sourceType].push_back(ObjectRule(name, expression, filter, di, scope)); + m_Rules[sourceType].push_back(ObjectRule(name, filter, di, scope)); } bool ObjectRule::EvaluateFilter(const Object::Ptr& scope) const diff --git a/lib/config/objectrule.hpp b/lib/config/objectrule.hpp index 3a0b5637b..cdb94af40 100644 --- a/lib/config/objectrule.hpp +++ b/lib/config/objectrule.hpp @@ -39,14 +39,13 @@ public: typedef std::map > RuleMap; String GetName(void) const; - Expression::Ptr GetExpression(void) const; Expression::Ptr GetFilter(void) const; DebugInfo GetDebugInfo(void) const; Object::Ptr GetScope(void) const; bool EvaluateFilter(const Object::Ptr& scope) const; - static void AddRule(const String& sourceType, const String& name, const Expression::Ptr& expression, + static void AddRule(const String& sourceType, const String& name, const Expression::Ptr& filter, const DebugInfo& di, const Object::Ptr& scope); static void EvaluateRules(bool clear); @@ -55,7 +54,6 @@ public: private: String m_Name; - Expression::Ptr m_Expression; Expression::Ptr m_Filter; DebugInfo m_DebugInfo; Object::Ptr m_Scope; @@ -63,8 +61,8 @@ private: static CallbackMap m_Callbacks; static RuleMap m_Rules; - ObjectRule(const String& name, const Expression::Ptr& expression, - const Expression::Ptr& filter, const DebugInfo& di, const Object::Ptr& scope); + ObjectRule(const String& name, const Expression::Ptr& filter, + const DebugInfo& di, const Object::Ptr& scope); }; } -- 2.49.0