Changeset 19034

Timestamp:

Aug 12, 2008, 12:53:34 PM (18 years ago)

Author:

eugene

Message:

adding p_psErrorV and equivalent macro

Location:

trunk/psLib/src/sys

Files:

• psError.c (modified) (3 diffs)
• psError.h (modified) (3 diffs)

trunk/psLib/src/sys/psError.c

@@ -11 +11 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-15 20:23:34 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-12 22:53:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -145 +145 @@
 }
 
+psErrorCode p_psErrorV(const char* filename,
+                       unsigned int lineno,
+                       const char* func,
+                       psErrorCode code,
+                       bool new,
+                       const char* format,
+                       va_list ap)
+{
+  char errMsg[MAX_STRING_LENGTH];
+    char msgName[MAX_STRING_LENGTH];
+
+    // if this the origin of a new error reset the error stack
+    if (new) {
+        psErrorClear();
+    }
+
+    snprintf(msgName, MAX_STRING_LENGTH, "%s (%s:%d)", func, filename, lineno);
+    vsnprintf(errMsg, MAX_STRING_LENGTH, format, ap);
+
+    // Remove a single trailing \n from message -- it interferes with
+    // psErrorStackPrint
+    size_t len = strlen(errMsg);
+    if (len > 0 && errMsg[len - 1] == '\n') {
+        errMsg[len - 1] = '\0';
+    }
+
+    psErr *err = psErrAlloc(msgName, code, errMsg);
+    psErrorStackPush(err);
+
+    #ifndef PS_NO_TRACE
+    // Call tracing function with PS_LOG_ERROR level
+    // p_psTrace() automatically appends the the function name to the facility
+    // for us
+    p_psTrace(__FILE__, __LINE__, func, "err", PS_LOG_ERROR, "%s : %s", err->name, err->msg);
+    #endif
+
+    psFree(err);
+
+    return code;
+}
+
 psErrorCode p_psError(const char* filename,
                       unsigned int lineno,
@@ -153 +194 @@
                       ...)
 {
-    char errMsg[MAX_STRING_LENGTH];
-    char msgName[MAX_STRING_LENGTH];
-
-    // if this the origin of a new error reset the error stack
-    if (new) {
-        psErrorClear();
-    }
-
-    snprintf(msgName, MAX_STRING_LENGTH, "%s (%s:%d)", func, filename, lineno);
-
     va_list ap;
     va_start(ap, format);
-
-    vsnprintf(errMsg, MAX_STRING_LENGTH, format, ap);
-
+    p_psErrorV(filename, lineno, func, code, new, format, ap);
     va_end(ap);
-
-    // Remove a single trailing \n from message -- it interferes with
-    // psErrorStackPrint
-    size_t len = strlen(errMsg);
-    if (len > 0 && errMsg[len - 1] == '\n') {
-        errMsg[len - 1] = '\0';
-    }
-
-    psErr *err = psErrAlloc(msgName, code, errMsg);
-    psErrorStackPush(err);
-
-    #ifndef PS_NO_TRACE
-    // Call tracing function with PS_LOG_ERROR level
-    // p_psTrace() automatically appends the the function name to the facility
-    // for us
-    p_psTrace(__FILE__, __LINE__, func, "err", PS_LOG_ERROR, "%s : %s", err->name, err->msg);
-    #endif
-
-    psFree(err);
-
     return code;
 }

trunk/psLib/src/sys/psError.h

@@ -12 +12 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-09 01:40:07 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-12 22:53:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -138 +138 @@
     ...                                ///< any parameters required in format
 );
+psErrorCode psErrorV(
+    psErrorCode code,                  ///< Error class code
+    bool new,                          ///< true if error originates at this location
+    const char* format,                ///< printf-style format of header line
+    va_list ap                         ///< any parameters required in format
+);
 #else // ifdef DOXYGEN
 psErrorCode p_psError(
@@ -148 +154 @@
     ...                                ///< any parameters required in format
 ) PS_ATTR_FORMAT(printf, 6, 7);
+psErrorCode p_psErrorV(
+    const char* filename,              ///< file name
+    unsigned int lineno,               ///< line number in file
+    const char* func,                  ///< function name
+    psErrorCode code,                  ///< Error class code
+    bool new,                          ///< true if error originates at this location
+    const char* format,                ///< printf-style format of header line
+    va_list ap                         ///< any parameters required in format
+  );
 #ifndef SWIG
-#define psError(code,new,...) \
-      p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
+#define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
+#define psErrorV(code,new,format,ap) p_psErrorV(__FILE__,__LINE__,__func__,code,new,format,ap)
 #endif // ifndef SWIG
 #endif // ifdef DOXYGEN