Changeset e380ffe in nscp

Timestamp:

06/15/08 20:14:32 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

157dea5

Parents:

782ac8e

Message:

2008-06-15 MickeM

• Applied patches from Jeff Goldschrafe <goldschr AT cshl.edu> + CheckDriveSize now uses "all drives" when no drive is specified.
  • Fixed misspellt Container

Files:

• include/checkHelpers.hpp (modified) (3 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (12 diffs)
• modules/CheckDisk/CheckDisk.h (modified) (1 diff)

include/checkHelpers.hpp

@@ -66 +66 @@
   typedef enum {showLong, showShort, showProblems, showUnknown} showType;
   template <class TContents>
-  struct CheckConatiner {
-    typedef CheckConatiner<TContents> TThisType;
+  struct CheckContainer {
+    typedef CheckContainer<TContents> TThisType;
     TContents warn;
     TContents crit;
@@ -77 +77 @@
 
 
-    CheckConatiner() : show(showUnknown), perfData(true)
+    CheckContainer() : show(showUnknown), perfData(true)
     {}
-    CheckConatiner(std::wstring data_, TContents warn_, TContents crit_) 
+    CheckContainer(std::wstring data_, TContents warn_, TContents crit_) 
       : data(data_), warn(warn_), crit(crit_), show(showUnknown) 
     {}
-    CheckConatiner(std::wstring name_, std::wstring alias_, TContents warn_, TContents crit_) 
+    CheckContainer(std::wstring name_, std::wstring alias_, TContents warn_, TContents crit_) 
       : data(data_), alias(alias_), warn(warn_), crit(crit_), show(showUnknown) 
     {}
-    CheckConatiner(const TThisType &other) 
+    CheckContainer(const TThisType &other) 
       : data(other.data), alias(other.alias), warn(other.warn), crit(other.crit), show(other.show) 
     {}
@@ -752 +752 @@
 }
 
+

modules/CheckDisk/CheckDisk.cpp

@@ -129 +129 @@
   }
 
-  DriveConatiner tmpObject;
+  DriveContainer tmpObject;
   bool bFilter = false;
   bool bFilterRemote = false;
@@ -139 +139 @@
   bool bNSClient = false;
   bool bPerfData = true;
-  std::list<DriveConatiner> drives;
+  std::list<DriveContainer> drives;
 
   MAP_OPTIONS_BEGIN(args)
@@ -165 +165 @@
   bFilter = bFilterFixed || bFilterCDROM  || bFilterRemote || bFilterRemovable;
 
+  if (drives.size() == 0)
+    bCheckAll = true;
+
   if (bCheckAll) {
     DWORD dwDrives = GetLogicalDrives();
@@ -178 +181 @@
           ((bFilter)&&(bFilterRemote)&&(drvType==DRIVE_REMOTE)) ||
           ((bFilter)&&(bFilterRemovable)&&(drvType==DRIVE_REMOVABLE)) )
-          drives.push_back(DriveConatiner(drv, tmpObject.warn, tmpObject.crit));
+          drives.push_back(DriveContainer(drv, tmpObject.warn, tmpObject.crit));
       }
       idx++;
@@ -185 +188 @@
   }
   if (bCheckAllOthers) {
-    std::list<DriveConatiner> checkdrives;
+    std::list<DriveContainer> checkdrives;
     DWORD dwDrives = GetLogicalDrives();
     int idx = 0;
@@ -200 +203 @@
         {
           bool bFound = false;
-          for (std::list<DriveConatiner>::const_iterator pit = drives.begin();pit!=drives.end();++pit) {
-            DriveConatiner drive = (*pit);
+          for (std::list<DriveContainer>::const_iterator pit = drives.begin();pit!=drives.end();++pit) {
+            DriveContainer drive = (*pit);
             if (drive.data == drv)
               bFound = true;
           }
           if (!bFound)
-            checkdrives.push_back(DriveConatiner(drv, tmpObject.warn, tmpObject.crit));
+            checkdrives.push_back(DriveContainer(drv, tmpObject.warn, tmpObject.crit));
         }
       }
@@ -216 +219 @@
 
 
-  for (std::list<DriveConatiner>::const_iterator pit = drives.begin();pit!=drives.end();++pit) {
-    DriveConatiner drive = (*pit);
+  for (std::list<DriveContainer>::const_iterator pit = drives.begin();pit!=drives.end();++pit) {
+    DriveContainer drive = (*pit);
     if (drive.data.length() == 1)
       drive.data += _T(":");
@@ -288 +291 @@
     return NSCAPI::returnUNKNOWN;
   }
-  PathConatiner tmpObject;
-  std::list<PathConatiner> paths;
+  PathContainer tmpObject;
+  std::list<PathContainer> paths;
 
   MAP_OPTIONS_BEGIN(args)
@@ -310 +313 @@
   MAP_OPTIONS_END()
 
-  for (std::list<PathConatiner>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {
-    PathConatiner path = (*pit);
+  for (std::list<PathContainer>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {
+    PathContainer path = (*pit);
     std::wstring tstr;
     std::wstring sName = path.getAlias();
@@ -475 +478 @@
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
   std::list<std::wstring> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsUInteger> CheckFileConatiner;
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsUInteger> CheckFileContainer;
   if (stl_args.empty()) {
     message = _T("Missing argument(s).");
@@ -511 +514 @@
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
   std::list<std::wstring> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsUInteger> CheckFileConatiner;
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsUInteger> CheckFileContainer;
   if (stl_args.empty()) {
     message = _T("Missing argument(s).");
@@ -517 +520 @@
   }
   file_filter_function finder;
-  PathConatiner tmpObject;
+  PathContainer tmpObject;
   std::list<std::wstring> paths;
   unsigned int truncate = 0;
-  CheckFileConatiner query;
+  CheckFileContainer query;
   std::wstring syntax = _T("%filename%");
   bool bPerfData = true;

modules/CheckDisk/CheckDisk.h

@@ -58 +58 @@
 
 private:
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsDiscSize> PathConatiner;
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsDiskSize> DriveConatiner;
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsDiscSize> PathContainer;
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinPercentageBoundsDiskSize> DriveContainer;
 };