Module: check_mk
Branch: master
Commit: d679c7187e2749a462d378561d7e87aa2fcadcc3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d679c7187e2749…
Author: Jukka Aro <ja(a)mathias-kettner.de>
Date: Mon Mar 19 16:39:17 2018 +0100
Win-agent: remove GetSystemTime from WinApi
The WinAPI call is no longer used, remove it from WinApi*.
---
agents/windows/WinApi.cc | 4 ----
agents/windows/WinApi.h | 1 -
agents/windows/WinApiAdaptor.h | 1 -
agents/windows/build_version | 2 +-
agents/windows/test/MockWinApi.h | 1 -
5 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/agents/windows/WinApi.cc b/agents/windows/WinApi.cc
index b68051d..6c2bb66 100644
--- a/agents/windows/WinApi.cc
+++ b/agents/windows/WinApi.cc
@@ -411,10 +411,6 @@ VOID WinApi::GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) const {
return ::GetSystemInfo(lpSystemInfo);
}
-VOID WinApi::GetSystemTime(LPSYSTEMTIME lpSystemTime) const {
- return ::GetSystemTime(lpSystemTime);
-}
-
WINBOOL WinApi::GetVersionEx(LPOSVERSIONINFO lpVersionInformation) const {
return ::GetVersionExA(lpVersionInformation);
}
diff --git a/agents/windows/WinApi.h b/agents/windows/WinApi.h
index 719f4a0..7d84d6a 100644
--- a/agents/windows/WinApi.h
+++ b/agents/windows/WinApi.h
@@ -197,7 +197,6 @@ public:
LPFILETIME lpUserTime) const override;
virtual VOID GetStartupInfo(LPSTARTUPINFO lpStartupInfo) const override;
virtual VOID GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) const override;
- virtual VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) const override;
virtual WINBOOL GetVersionEx(
LPOSVERSIONINFO lpVersionInformation) const override;
virtual WINBOOL GetVolumeInformation(
diff --git a/agents/windows/WinApiAdaptor.h b/agents/windows/WinApiAdaptor.h
index 788eef9..9b57695 100644
--- a/agents/windows/WinApiAdaptor.h
+++ b/agents/windows/WinApiAdaptor.h
@@ -245,7 +245,6 @@ public:
LPFILETIME lpUserTime) const = 0;
virtual VOID GetStartupInfo(LPSTARTUPINFO lpStartupInfo) const = 0;
virtual VOID GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) const = 0;
- virtual VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) const = 0;
virtual WINBOOL GetVersionEx(
LPOSVERSIONINFO lpVersionInformation) const = 0;
virtual WINBOOL GetVolumeInformation(
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 19d718c..b4ca7ef 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-3192
+3194
diff --git a/agents/windows/test/MockWinApi.h b/agents/windows/test/MockWinApi.h
index 9a5c749..f0168cc 100644
--- a/agents/windows/test/MockWinApi.h
+++ b/agents/windows/test/MockWinApi.h
@@ -222,7 +222,6 @@ public:
LPFILETIME lpUserTime));
MOCK_CONST_METHOD1(GetStartupInfo, VOID(LPSTARTUPINFO lpStartupInfo));
MOCK_CONST_METHOD1(GetSystemInfo, VOID(LPSYSTEM_INFO lpSystemInfo));
- MOCK_CONST_METHOD1(GetSystemTime, VOID(LPSYSTEMTIME lpSystemTime));
MOCK_CONST_METHOD1(GetVersionEx,
WINBOOL(LPOSVERSIONINFO lpVersionInformation));
MOCK_CONST_METHOD8(