Changeset 818b54e in nscp for service/NSClient++.h

Timestamp:

11/11/09 06:59:09 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

3eedfa6

Parents:

77b729e

Message:

First version which builds on Linux!!! (though 99% of all features are still disabled).
All it does is build and tell you there is no settings subsystem (which there isn't as simpleini does not support wchar_t on unix :(

File:

• service/NSClient++.h (modified) (5 diffs)

service/NSClient++.h

@@ -20 +20 @@
 ***************************************************************************/
 #pragma once
-
+#include <types.hpp>
 #include <config.h>
 #include <service/system_service.hpp>
@@ -146 +146 @@
   // Member functions
   std::wstring getBasePath(void);
-  NSCAPI::nagiosReturn injectRAW(const TCHAR* command, const unsigned int argLen, TCHAR **argument, TCHAR *returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR *returnPerfBuffer, unsigned int returnPerfBufferLen);
-  NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf);
+  NSCAPI::nagiosReturn injectRAW(const wchar_t* command, const unsigned int argLen, wchar_t **argument, wchar_t *returnMessageBuffer, unsigned int returnMessageBufferLen, wchar_t *returnPerfBuffer, unsigned int returnPerfBufferLen);
+  NSCAPI::nagiosReturn inject(std::wstring command, std::wstring arguments, wchar_t splitter, bool escape, std::wstring &msg, std::wstring & perf);
 //  std::wstring inject(const std::wstring buffer);
   std::wstring execute(std::wstring password, std::wstring cmd, std::list<std::wstring> args);
-  void reportMessage(int msgType, const TCHAR* file, const int line, std::wstring message);
-  int commandLineExec(const TCHAR* module, const TCHAR* command, const unsigned int argLen, TCHAR** args);
+  void reportMessage(int msgType, const wchar_t* file, const int line, std::wstring message);
+  int commandLineExec(const wchar_t* module, const wchar_t* command, const unsigned int argLen, wchar_t** args);
 
   void addPlugins(const std::list<std::wstring> plugins);
@@ -161 +161 @@
   void registerCommand(std::wstring cmd, std::wstring desc);
   unsigned int getBufferLength();
-  void HandleSettingsCLI(TCHAR* arg, int argc, TCHAR* argv[]);
+  void HandleSettingsCLI(wchar_t* arg, int argc, wchar_t* argv[]);
   void startTrayIcons();
   void startTrayIcon(DWORD dwSessionId);
@@ -172 +172 @@
   void session_error(std::wstring file, unsigned int line, std::wstring msg);
   void session_info(std::wstring file, unsigned int line, std::wstring msg);
-  void session_log_message(int msgType, const TCHAR* file, const int line, std::wstring message) {
+  void session_log_message(int msgType, const wchar_t* file, const int line, std::wstring message) {
     reportMessage(msgType, file, line, message);
   }
-  int session_inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
+  int session_inject(std::wstring command, std::wstring arguments, wchar_t splitter, bool escape, std::wstring &msg, std::wstring & perf) {
     return inject(command, arguments, splitter, escape, msg, perf);
   }
@@ -197 +197 @@
 std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
 
-#ifndef __FILEW__
-#define R(x) _T(x)
-#define __FILEW__ R(__FILE__)
-#endif
 //////////////////////////////////////////////////////////////////////////
 // Log macros to simplify logging