Clean up the DebugInfo class

refs #7709

diff --git a/lib/base/debuginfo.cpp b/lib/base/debuginfo.cpp
index eeda4f5f858a39e0186caf9932f9a691a45eb298..c98d06c80916c9ec950fc565b5fc5306b02f49ee 100644 (file)
--- a/lib/base/debuginfo.cpp
+++ b/lib/base/debuginfo.cpp
@@ -23,6 +23,10 @@
 
 using namespace icinga;
 
+DebugInfo::DebugInfo(void)
+       : FirstLine(0), FirstColumn(0), LastLine(0), LastColumn(0)
+{ }
+
 /**
  * Outputs a DebugInfo struct to a stream.
  *

diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp
index cd8e2a57966782f52eabfdeb9a486cd165bee801..d5d8bc47106027c8c677df71d7034b16d847fdb9 100644 (file)
--- a/lib/base/debuginfo.hpp
+++ b/lib/base/debuginfo.hpp
@@ -31,7 +31,7 @@ namespace icinga
  *
  * @ingroup config
  */
-struct DebugInfo
+struct I2_BASE_API DebugInfo
 {
        String Path;
 
@@ -41,16 +41,14 @@ struct DebugInfo
        int LastLine;
        int LastColumn;
 
-       DebugInfo(void)
-               : FirstLine(0), FirstColumn(0), LastLine(0), LastColumn(0)
-       { }
+       DebugInfo(void);
 };
 
 I2_BASE_API std::ostream& operator<<(std::ostream& out, const DebugInfo& val);
 
 I2_BASE_API DebugInfo DebugInfoRange(const DebugInfo& start, const DebugInfo& end);
 
-I2_BASE_API void ShowCodeFragment(std::ostream& out, const DebugInfo& di, bool verbose);
+I2_BASE_API void ShowCodeFragment(std::ostream& out, const DebugInfo& di, bool verbose = true);
 
 }
 

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 6129c5cd27a2e5978efe54c4ed123d501363f5fb..255e9d457ef91a7cbcb4a00a64651a920178e65d 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -144,7 +144,7 @@ static bool LoadConfigFiles(const boost::program_options::variables_map& vm, con
 
        BOOST_FOREACH(const ConfigCompilerMessage& message, ConfigCompilerContext::GetInstance()->GetMessages()) {
                std::ostringstream locbuf;
-               ShowCodeFragment(locbuf, message.Location, true);
+               ShowCodeFragment(locbuf, message.Location);
                String location = locbuf.str();
 
                String logmsg;