Module: check_mk
Branch: master
Commit: 5fc5437bd1ea062de7ca2792e969d9c2138fb406
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fc5437bd1ea06…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Apr 12 10:08:50 2019 +0200
Clang-formatted.
Change-Id: Id89264863f97562a07616cd42182937b010dc6b3
---
agents/windows/EventLog.cc | 5 ++---
agents/windows/ModuleControl.h | 6 +++---
agents/windows/check_mk_agent.cc | 4 ++--
agents/windows/sections/SectionWMI.h | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc
index 23d7ce8..b20619e 100644
--- a/agents/windows/EventLog.cc
+++ b/agents/windows/EventLog.cc
@@ -175,9 +175,8 @@ wstring MessageResolver::resolve(DWORD eventID, LPCWSTR source,
result += parameters[i];
}
}
- std::replace_if(
- result.begin(), result.end(),
- [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, '
');
+ std::replace_if(result.begin(), result.end(),
+ [](wchar_t ch) { return ch == '\n' || ch == '\r'; },
' ');
return result;
}
diff --git a/agents/windows/ModuleControl.h b/agents/windows/ModuleControl.h
index ff38872..f5fb175 100644
--- a/agents/windows/ModuleControl.h
+++ b/agents/windows/ModuleControl.h
@@ -55,11 +55,11 @@ Usage:
#pragma once
#define WINDOWS_LEAN_AND_MEAN
-#include <windows.h>
#include <sys/stat.h>
-#include <string>
-#include <fstream>
+#include <windows.h>
#include <cstdint>
+#include <fstream>
+#include <string>
// MAIN NAMESPACE for C++ based Check MK Agents
namespace cma {
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index cf43245..11760f4 100644
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -1000,8 +1000,8 @@ void addIPv6Addresses() {
// copy pasted from the Environment::determineAgentDirectory
// ATM Environment is absent.
// *********************************************************
-// We have here here disaster: absolutely universal code
-// to obtain location of our folder and plugins had been
+// We have here here disaster: absolutely universal code
+// to obtain location of our folder and plugins had been
// closed into the Environment class and forced to use
// persistent data from those class. This was quite bad idea.
static const int MAX_PATH_UNICODE = 32767;
diff --git a/agents/windows/sections/SectionWMI.h b/agents/windows/sections/SectionWMI.h
index 801c501..24066f1 100644
--- a/agents/windows/sections/SectionWMI.h
+++ b/agents/windows/sections/SectionWMI.h
@@ -58,7 +58,7 @@ private:
time_t _disabled_until{0};
std::unique_ptr<wmi::Helper> _helper;
- std::string cached_; // last output stored here, may be reused on timeout
+ std::string cached_; // last output stored here, may be reused on timeout
};
#endif // SectionWMI_h