Changeset 1807 for trunk/psLib/src/sysUtils

Timestamp:

Sep 14, 2004, 10:01:52 AM (22 years ago)

Author:

desonia

Message:

Updated files in src/collections to use new psError functionality. Also
cleaned up the code where needed, removing unnecessary error conditions,
etc.

Location:

trunk/psLib/src/sysUtils

Files:

• psError.c (modified) (4 diffs)
• psError.h (modified) (3 diffs)
• psErrorCodes.c (modified) (2 diffs)
• psErrorCodes.h (modified) (2 diffs)
• psLogMsg.c (modified) (2 diffs)
• psLogMsg.h (modified) (2 diffs)

trunk/psLib/src/sysUtils/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-07 19:05:07 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 20:01:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -96 +96 @@
     va_list argPtr;             // variable list arguement pointer
 
-    // Get the variable list parameters to pass to logging function
-    va_start(argPtr, fmt);
-
-    // Call logging function with PS_LOG_ERROR level
-    psLogMsgV(name, PS_LOG_ERROR, fmt, argPtr);
-
     if (new) {
         psErrorClear();
     }
 
+    // Get the variable list parameters to pass to logging function
+    va_start(argPtr, fmt);
+
     vsnprintf(errMsg,1024,fmt,argPtr);
     err = psErrAlloc(name,code,errMsg);
     pushErrorStack(err);
+
+    // Call logging function with PS_LOG_ERROR level
+    psLogMsg(name, PS_LOG_ERROR, errMsg);
 
     // Clean up stack after variable argument has been used
@@ -116 +116 @@
 }
 
-const psErr* psErrorGet(int which)
+psErr* psErrorGet(int which)
 {
     psErr* result;
@@ -134 +134 @@
 }
 
-const psErr* psErrorLast(void)
+psErr* psErrorLast(void)
 {
     return psErrorGet(0);

trunk/psLib/src/sysUtils/psError.h

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-10 23:20:35 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 20:01:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
  *  @return    Error message object at 'which'
  */
-const psErr* psErrorGet(
+psErr* psErrorGet(
     int which                          ///< position in the error stack. 0 is last error on stack.
 );
@@ -61 +61 @@
  *  @return psErr*     Reference to last error message on error stack
  */
-const psErr* psErrorLast(void);
+psErr* psErrorLast(void);
 
 /** Clears the error stack.

trunk/psLib/src/sysUtils/psErrorCodes.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 00:43:54 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 20:01:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
             {PS_ERR_MEMORY_DEREF_USAGE,"dereferenced memory still used"},
             {PS_ERR_BAD_PARAMETER_VALUE,"parameter is out-of-range"},
+            {PS_ERR_BAD_PARAMETER_TYPE,"parameter is of unsupported data-type"},
             {PS_ERR_BAD_PARAMETER_NULL,"parameter is null"},
-            {PS_ERR_BAD_PARAMETER_LENGTH,"parameter string is too long"},
+            {PS_ERR_BAD_PARAMETER_SIZE,"size of parameter's data is outside of acceptable range."},
             {PS_ERR_UNEXPECTED_NULL,"unexpected NULL foun"},
             //~End

trunk/psLib/src/sysUtils/psErrorCodes.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 00:43:54 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 20:01:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
     PS_ERR_MEMORY_DEREF_USAGE,   ///< dereferenced memory still used
     PS_ERR_BAD_PARAMETER_VALUE,   ///< parameter is out-of-range
+    PS_ERR_BAD_PARAMETER_TYPE,   ///< parameter is of unsupported data-type
     PS_ERR_BAD_PARAMETER_NULL,   ///< parameter is null
-    PS_ERR_BAD_PARAMETER_LENGTH,   ///< parameter string is too long
+    PS_ERR_BAD_PARAMETER_SIZE,   ///< size of parameter's data is outside of acceptable range.
     PS_ERR_UNEXPECTED_NULL,   ///< unexpected NULL foun
     //~End

trunk/psLib/src/sysUtils/psLogMsg.c

@@ -11 +11 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 03:03:36 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 20:01:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -383 +383 @@
     va_end(ap);
 }
+void psWarning(const char* name, const char* fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    psLogMsgV(name, PS_LOG_WARN, fmt, ap);
+    va_end(ap);
+}

trunk/psLib/src/sysUtils/psLogMsg.h

@@ -11 +11 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 03:03:36 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 20:01:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -99 +99 @@
 };
 
+/** Logs a warning message.
+ *
+ *  This procedure logs a message to the destination set by a prior
+ *  call to psLogSetDestination(), This is equivalent to calling
+ *  psLogMsg with a level of PS_LOG_WARN.
+ *
+ */
+void psWarning(
+    const char* name,
+    const char* fmt,
+    ...
+);
+
 /// @}