Changeset 8223547 in nscp for modules

Timestamp:

03/01/05 22:42:27 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

2a94f3f

Parents:

36c340d

Message:

• Improved thread safety in Core + Added exception handling and logging in PDH code
• Various fixes all over the place + New module for check size of files/directories
• Changed build to Dynamic link
• Added regular expression support for EventLog? checker

Location:

modules

Files:

• CheckDisk/CheckDisk.cpp (modified) (1 diff)
• CheckEventLog/CheckEventLog.cpp (modified) (3 diffs)
• CheckEventLog/CheckEventLog.vcproj (modified) (1 diff)
• NSClientCompat/NSClientCompat.cpp (modified) (3 diffs)

modules/CheckDisk/CheckDisk.cpp

@@ -111 +111 @@
   std::string ret;
   NSCAPI::returnCodes returnCode = NSCAPI::returnOK;
-  std::list<std::string> args = NSCHelper::makelist(argLen, char_args);
+  std::list<std::string> args = NSCHelper::arrayBuffer2list(argLen, char_args);
   if (args.empty())
     return "Missing argument(s).";

modules/CheckEventLog/CheckEventLog.cpp

@@ -225 +225 @@
     try {
       std::string s = p.second;
-      NSC_DEBUG_MSG_STD("Attempting to make regexp from: " + s);
       item.eventSourceRegExp_ = s;
-      NSC_DEBUG_MSG_STD("success...");
     } catch (const boost::bad_expression e) {
       item.eventSourceRegExp_ = "";
@@ -250 +248 @@
   } else
     throw (std::string)"Invalid argument: " + p.first;
+  
 }
 void addToQueryBundle(searchQuery::searchQueryBundle &bundle, std::string arg) {
@@ -301 +300 @@
     return "";
   NSCAPI::returnCodes rCode = NSCAPI::returnOK;
-  std::list<std::string> args = NSCHelper::makelist(argLen, char_args);
+  std::list<std::string> args = NSCHelper::arrayBuffer2list(argLen, char_args);
   if (args.size() < 2)
     return "Missing argument";

modules/CheckEventLog/CheckEventLog.vcproj

@@ -120 +120 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_STLP_USE_STATIC_LIB;SYSTRAY_EXPORTS"
-        RuntimeLibrary="0"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_REGEX_DYN_LINK"
+        RuntimeLibrary="2"
         UsePrecompiledHeader="3"
         WarningLevel="3"

modules/NSClientCompat/NSClientCompat.cpp

@@ -125 +125 @@
     case REQ_CPULOAD:
       {
-        stl_args = NSCHelper::makelist(argLen, args);
+        stl_args = NSCHelper::arrayBuffer2list(argLen, args);
         if (stl_args.empty())
           return "ERROR: Missing argument exception.";
@@ -141 +141 @@
       }
     case REQ_SERVICESTATE:
-      return NSCommands::serviceState(NSCHelper::makelist(argLen, args));
+      return NSCommands::serviceState(NSCHelper::arrayBuffer2list(argLen, args));
 
     case REQ_PROCSTATE:
-      return NSCommands::procState(NSCHelper::makelist(argLen, args));
+      return NSCommands::procState(NSCHelper::arrayBuffer2list(argLen, args));
 
     case REQ_MEMUSE:
@@ -151 +151 @@
 
     case REQ_USEDDISKSPACE:
-      return NSCommands::usedDiskSpace(NSCHelper::makelist(argLen, args));
+      return NSCommands::usedDiskSpace(NSCHelper::arrayBuffer2list(argLen, args));
   }
   return "";