Changeset 2273 for trunk/psLib/src/sys/psError.c

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

• trunk/psLib/src/sys/psError.c (modified) (4 diffs)

trunk/psLib/src/sys/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
 }
 
-void psError(const char *name, const char *fmt, ...)
+psErrorCode p_psError(const char* file,
+                      int lineno,
+                      const char* func,
+                      psErrorCode code,
+                      psBool new,
+                      const char* fmt,
+                      ...)
 {
-    va_list argPtr;             // variable list arguement pointer
+    char errMsg[2048];
+    psErr* err;
+    char msgName[256];
 
-    // 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);
-
-    // Clean up stack after variable argument has been used
-    va_end(argPtr);
-}
-
-void psErrorClear()
-{
-    pthread_mutex_lock(&lockErrorStack);
-    for (psS32 lcv=0;lcv<errorStackSize;lcv++) {
-        p_psMemSetPersistent(errorStack[lcv]->msg,false);
-        p_psMemSetPersistent(errorStack[lcv]->name,false);
-        p_psMemSetPersistent(errorStack[lcv],false);
-        psFree(errorStack[lcv]);
-    }
-    errorStackSize = 0;
-    pthread_mutex_unlock(&lockErrorStack);
-}
-
-psErrorCode psErrorMsg(const char *name, psErrorCode code, psBool new, const char* fmt, ...)
-{
-    char errMsg[1024];
-    psErr* err;
-    char* msgName;
-
-    // Check for null pointer and if found set to empty string;
-    if ( name == NULL ) {
-        msgName = "";
-    } else {
-        msgName = (char*)name;
-    }
+    snprintf(msgName,256,"%s (%s:%d)",func,file,lineno);
 
     va_list argPtr;             // variable list arguement pointer
@@ -116 +90 @@
     va_start(argPtr, fmt);
 
-    vsnprintf(errMsg,1024,fmt,argPtr);
+    vsnprintf(errMsg,2048,fmt,argPtr);
     err = psErrAlloc(msgName,code,errMsg);
     pushErrorStack(err);
@@ -160 +134 @@
 }
 
+void psErrorClear(void)
+{
+    pthread_mutex_lock(&lockErrorStack);
+
+    for (int lcv=0;lcv < errorStackSize; lcv++) {
+        p_psMemSetPersistent(errorStack[lcv],false);
+        p_psMemSetPersistent(errorStack[lcv]->msg,false);
+        p_psMemSetPersistent(errorStack[lcv]->name,false);
+        psFree(errorStack[lcv]);
+    }
+    errorStackSize = 0;
+
+    pthread_mutex_unlock(&lockErrorStack);
+
+}
 void psErrorStackPrint(FILE *fd, const char *fmt, ...)
 {