Changeset 3476 for trunk/psLib/src/sysUtils

Timestamp:

Mar 22, 2005, 11:52:49 AM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src/sysUtils

Files:

• psError.c (modified) (2 diffs)
• psError.h (modified) (4 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.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-22 21:52:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -103 +103 @@
 
     return code;
+}
+
+void p_psWarning(const char* file,
+                 int lineno,
+                 const char* func,
+                 const char* fmt,
+                 ...)
+{
+    char msgName[1024];
+
+    snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno);
+
+    va_list argPtr;             // variable list argument pointer
+
+    // Get the variable list parameters to pass to logging function
+    va_start(argPtr, fmt);
+
+    psLogMsgV(msgName, PS_LOG_WARN, fmt, argPtr);
+
+    // Clean up stack after variable argument has been used
+    va_end(argPtr);
+
+    return;
 }
 

trunk/psLib/src/sysUtils/psError.h

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-22 21:52:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -106 +106 @@
 #endif
 
+#ifdef DOXYGEN
 /** Reports an error message to the logging facility
  *
@@ -116 +117 @@
  *  @return psErrorCode    the given error code
  */
-#ifdef DOXYGEN
 psErrorCode psError(
     psErrorCode code,                  ///< Error class code
     psBool new,                        ///< true if error originates at this location
+    const char* fmt,
+    ...
+);
+
+/** 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* fmt,
     ...
@@ -133 +145 @@
     ...
 );
+void p_psWarning(
+    const char* file,
+    int lineno,
+    const char* func,
+    const char* fmt,
+    ...
+);
+
 
 #ifndef SWIG
 #define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
+#define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__)
 #endif
 

trunk/psLib/src/sysUtils/psLogMsg.c

@@ -11 +11 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-22 21:52:49 $
  *
  *  Copyright 2004-2005 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.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-22 21:52:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -102 +102 @@
 };
 
-/** 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,
-    ...
-);
-
 /// @}