Changeset 4342 for trunk/psLib/src/sys

Timestamp:

Jun 21, 2005, 4:05:41 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/sys

Files:

• psError.c (modified) (4 diffs)
• psError.h (modified) (2 diffs)
• psType.h (modified) (2 diffs)

trunk/psLib/src/sys/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 02:30:50 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
 }
 
-psErrorCode p_psError(const char* file,
-                      int lineno,
+psErrorCode p_psError(const char* filename,
+                      unsigned int lineno,
                       const char* func,
                       psErrorCode code,
-                      psBool new,
-                      const char* fmt,
+                      bool new,
+                      const char* format,
                       ...)
 {
@@ -79 +79 @@
     char msgName[1024];
 
-    snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno);
+    snprintf(msgName,1024,"%s (%s:%d)",func,filename,lineno);
 
     va_list argPtr;             // variable list arguement pointer
@@ -88 +88 @@
 
     // Get the variable list parameters to pass to logging function
-    va_start(argPtr, fmt);
-
-    vsnprintf(errMsg,2048,fmt,argPtr);
+    va_start(argPtr, format);
+
+    vsnprintf(errMsg,2048,format,argPtr);
     err = psErrAlloc(msgName,code,errMsg);
     pushErrorStack(err);

trunk/psLib/src/sys/psError.h

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 02:30:50 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -148 +148 @@
  */
 psErrorCode p_psError(
-    const char* file,                  ///< file name
-    int lineno,                        ///< line number in file
+    const char* filename,              ///< file name
+    unsigned int lineno,               ///< line number in file
     const char* func,                  ///< function name
     psErrorCode code,                  ///< Error class code
-    psBool new,                        ///< true if error originates at this location
-    const char* fmt,                   ///< printf-style format of header line
+    bool new,                          ///< true if error originates at this location
+    const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in fmt
 );

trunk/psLib/src/sys/psType.h

@@ -10 +10 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 00:11:08 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-22 02:05:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -71 +71 @@
 #endif // !SWIG
 
+typedef char* psString;                ///< string value
 typedef void* psPtr;                   ///< void pointer
 typedef bool psBool;                   ///< boolean value