[icinga-checkins] icinga.org: icinga2/master: Windows fix for ConfigCompiler::ReadInput.

git at icinga.org git at icinga.org
Wed Jan 23 21:58:28 CET 2013


Module: icinga2
Branch: master
Commit: 99e58f7031a3e011b06527585feabc6694af2979
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=99e58f7031a3e011b06527585feabc6694af2979

Author: Gunnar Beutner <gunnar at beutner.name>
Date:   Wed Jan 23 21:58:19 2013 +0100

Windows fix for ConfigCompiler::ReadInput.

---

 lib/config/configcompiler.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 2910278..4f0f1dd 100644
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -55,7 +55,7 @@ ConfigCompiler::~ConfigCompiler(void)
  */
 size_t ConfigCompiler::ReadInput(char *buffer, size_t max_size)
 {
-	m_Input->readsome(buffer, max_size);
+	m_Input->read(buffer, max_size);
 	return static_cast<size_t>(m_Input->gcount());
 }
 
@@ -122,7 +122,7 @@ void ConfigCompiler::HandleLibrary(const String& library)
 vector<ConfigItem::Ptr> ConfigCompiler::CompileStream(const String& path,
     istream *stream)
 {
-	stream->exceptions(istream::failbit | istream::badbit);
+	stream->exceptions(istream::badbit);
 
 	ConfigCompiler ctx(path, stream);
 	ctx.Compile();





More information about the icinga-checkins mailing list