Code cleanup.

diff --git a/base/object.cpp b/base/object.cpp
index 924cc984236b4d917d997d5e4f0873e14a5f5dbe..ccc9ac1716a5cbf3117d5e8d1ca9d520f5d10318 100644 (file)
--- a/base/object.cpp
+++ b/base/object.cpp
@@ -55,7 +55,7 @@ void Object::ClearHeldObjects(void)
        m_HeldObjects.clear();
 }
 
-SharedPtrHolder Object::GetSelf(void)
+Object::SharedPtrHolder Object::GetSelf(void)
 {
-       return SharedPtrHolder(shared_from_this());
+       return Object::SharedPtrHolder(shared_from_this());
 }

diff --git a/base/object.h b/base/object.h
index ca8170e3391011e04ff4dd7dd21ec5344b0e1b11..d0287947c737baf370d2ea11decdea6261df535a 100644 (file)
--- a/base/object.h
+++ b/base/object.h
@@ -45,46 +45,46 @@ protected:
 
        void Hold(void);
 
-       SharedPtrHolder GetSelf(void);
-
-private:
-       Object(const Object& other);
-       Object operator=(const Object& rhs);
-
-       static vector<Object::Ptr> m_HeldObjects;
-};
-
-/**
- * Holds a shared pointer and provides support for implicit upcasts.
- */
-class SharedPtrHolder
-{
-public:
-       explicit SharedPtrHolder(const shared_ptr<Object>& object)
-               : m_Object(object)
-       { }
-
-       template<typename T>
-       operator shared_ptr<T>(void) const
+       /**
+        * Holds a shared pointer and provides support for implicit upcasts.
+        */
+       class SharedPtrHolder
        {
+       public:
+               explicit SharedPtrHolder(const Object::Ptr& object)
+                       : m_Object(object)
+               { }
+
+               template<typename T>
+               operator shared_ptr<T>(void) const
+               {
 #ifdef _DEBUG
-               shared_ptr<T> other = dynamic_pointer_cast<T>(m_Object);
-               assert(other);
+                       shared_ptr<T> other = dynamic_pointer_cast<T>(m_Object);
+                       assert(other);
 #else /* _DEBUG */
-               shared_ptr<T> other = static_pointer_cast<T>(m_Object);
+                       shared_ptr<T> other = static_pointer_cast<T>(m_Object);
 #endif /* _DEBUG */
 
-               return other;
-       }
+                       return other;
+               }
 
-       template<typename T>
-       operator weak_ptr<T>(void) const
-       {
-               return static_cast<shared_ptr<T> >(*this);
-       }
+               template<typename T>
+               operator weak_ptr<T>(void) const
+               {
+                       return static_cast<shared_ptr<T> >(*this);
+               }
+
+       private:
+               Object::Ptr m_Object;
+       };
+
+       SharedPtrHolder GetSelf(void);
 
 private:
-       shared_ptr<Object> m_Object;
+       Object(const Object& other);
+       Object operator=(const Object& rhs);
+
+       static vector<Object::Ptr> m_HeldObjects;
 };
 
 /**

diff --git a/icinga/nagioschecktask.cpp b/icinga/nagioschecktask.cpp
index 26868806bf46169584b9969fadf08054d2be4086..92c992d05ac71dc79efab407541733bd2035f939 100644 (file)
--- a/icinga/nagioschecktask.cpp
+++ b/icinga/nagioschecktask.cpp
@@ -25,7 +25,7 @@ CheckResult NagiosCheckTask::Execute(void) const
        fp = popen(command.c_str(), "r");
 #endif /* _MSC_VER */
 
-       stringstream output;
+       stringstream outputbuf;
 
        while (!feof(fp)) {
                char buffer[128];
@@ -34,10 +34,11 @@ CheckResult NagiosCheckTask::Execute(void) const
                if (read == 0)
                        break;
 
-               output << string(buffer, buffer + read);
+               outputbuf << string(buffer, buffer + read);
        }
 
-       cr.Output = output.str();
+       cr.Output = outputbuf.str();
+       boost::algorithm::trim(cr.Output);
 
        Application::Log(LogDebug, "icinga", "Nagios plugin output: " + cr.Output);