Changeset 81e29d8 in nscp for include/NSCHelper.h

Timestamp:

03/21/05 08:55:37 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

d4f294a

Parents:

c6e008c

Message:

Fixed bug in INject (now things should work, but far from stable)

File:

• include/NSCHelper.h (modified) (3 diffs)

include/NSCHelper.h

@@ -9 +9 @@
 namespace NSCHelper
 {
-//  int wrapReturnString(char *buffer, unsigned int bufLen, std::string str, int defaultReturnCode);
+#ifdef DEBUG
   NSCAPI::nagiosReturn wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::nagiosReturn defaultReturnCode);
   NSCAPI::errorReturn wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::errorReturn defaultReturnCode);
+#else
+  int wrapReturnString(char *buffer, unsigned int bufLen, std::string str, int defaultReturnCode);
+#endif
 
   std::list<std::string> arrayBuffer2list(const unsigned int argLen, char **argument);
@@ -87 +90 @@
   typedef void (*lpNSAPIMessage)(int, const char*, const int, const char*);
   typedef NSCAPI::errorReturn (*lpNSAPIStopServer)(void);
-  typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const char*, const unsigned int, char **, char *, unsigned int );
+  typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const char*, const unsigned int, char **, char *, unsigned int, char *, unsigned int);
   typedef LPVOID (*lpNSAPILoader)(char*);
 
@@ -96 +99 @@
   int getSettingsInt(std::string section, std::string key, int defaultValue);
   void Message(int msgType, std::string file, int line, std::string message);
-  NSCAPI::nagiosReturn InjectCommandRAW(const char* command, const unsigned int argLen, char **argument, char *returnBuffer, unsigned int returnBufferLen);
+  NSCAPI::nagiosReturn InjectCommandRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen);
   NSCAPI::nagiosReturn InjectCommand(const char* command, const unsigned int argLen, char **argument, std::string & message, std::string & perf);
   NSCAPI::nagiosReturn InjectSplitAndCommand(const char* command, char* buffer, char splitChar, std::string & message, std::string & perf);