Index: trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- trunk/psLib/src/sys/psLogMsg.c	(revision 4316)
+++ trunk/psLib/src/sys/psLogMsg.c	(revision 4321)
@@ -12,6 +12,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64,5 +64,5 @@
  The old log level.
  *****************************************************************************/
-psS32 psLogSetLevel(psS32 level)
+int psLogSetLevel(int level)
 {
     // Save old global log level for changing it.
@@ -233,5 +233,5 @@
    ap
  *****************************************************************************/
-void psLogMsgV(const char *name, psS32 level, const char *fmt, va_list ap)
+void psLogMsgV(const char *name, int level, const char *format, va_list ap)
 {
     static psS32 first = 1;       // Flag for calling gethostname()
@@ -287,5 +287,5 @@
 
     default:
-        psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, fmt);
+        psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, format);
         level = (level < 0) ? 0 : 9;
         clevel = level + '0';
@@ -335,5 +335,5 @@
         char msg[1024];
         char* msgPtr;
-        vsnprintf(msg,1024, fmt, ap);  // create message
+        vsnprintf(msg,1024, format, ap);  // create message
 
         // detect multiple lines in message and indent each line by 4 spaces.
Index: trunk/psLib/src/sys/psLogMsg.h
===================================================================
--- trunk/psLib/src/sys/psLogMsg.h	(revision 4316)
+++ trunk/psLib/src/sys/psLogMsg.h	(revision 4321)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44,6 +44,6 @@
  *  @return psS32    old logging level
  */
-psS32 psLogSetLevel(
-    psS32 level                          ///< Specifies the system log level
+int psLogSetLevel(
+    int level                          ///< Specifies the system log level
 );
 
@@ -79,6 +79,6 @@
 void psLogMsgV(
     const char *name,                  ///< name of the log source
-    psS32 myLevel,                       ///< severity level of this log message
-    const char *fmt,                   ///< printf-style format command
+    int level,                         ///< severity level of this log message
+    const char *format,                ///< printf-style format command
     va_list ap                         ///< varargs argument list
 );
Index: trunk/psLib/src/sys/psMemory.c
===================================================================
--- trunk/psLib/src/sys/psMemory.c	(revision 4316)
+++ trunk/psLib/src/sys/psMemory.c	(revision 4321)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 21:42:02 $
+*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -255,5 +255,5 @@
 }
 
-psS32 psMemCheckCorruption(psBool abort_on_error)
+int psMemCheckCorruption(bool abort_on_error)
 {
     psS32 nbad = 0;               // number of bad blocks
@@ -504,22 +504,22 @@
 
 // return refCounter
-psReferenceCount psMemGetRefCounter(psPtr vptr)
-{
-    psMemBlock* ptr;
+psReferenceCount psMemGetRefCounter(const psPtr ptr)
+{
+    psMemBlock* ptr2;
     psU32 refCount;
 
-    if (vptr == NULL) {
+    if (ptr == NULL) {
         return 0;
     }
 
-    ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    pthread_mutex_lock(&ptr->refCounterMutex);
-    refCount = ptr->refCounter;
-    pthread_mutex_unlock(&ptr->refCounterMutex);
+    ptr2 = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(ptr2, __func__) != 0) {
+        memProblemCallback(ptr2, __func__, __LINE__);
+    }
+
+    pthread_mutex_lock(&ptr2->refCounterMutex);
+    refCount = ptr2->refCounter;
+    pthread_mutex_unlock(&ptr2->refCounterMutex);
 
     return refCount;
Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 4316)
+++ trunk/psLib/src/sys/psMemory.h	(revision 4321)
@@ -12,6 +12,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -270,6 +270,6 @@
  *  @ingroup memTracing
  */
-psS32 psMemCheckCorruption(
-    psBool abort_on_error                ///< Abort on detecting corruption?
+int psMemCheckCorruption(
+    bool abort_on_error                ///< Abort on detecting corruption?
 );
 
@@ -279,5 +279,5 @@
  */
 psReferenceCount psMemGetRefCounter(
-    psPtr vptr                         ///< Pointer to get refCounter for
+    const psPtr ptr                    ///< Pointer to get refCounter for
 );
 
@@ -288,5 +288,5 @@
 #ifdef DOXYGEN
 psPtr psMemIncrRefCounter(
-    psPtr vptr                         ///< Pointer to increment refCounter, and return
+    const psPtr ptr                         ///< Pointer to increment refCounter, and return
 );
 #else
@@ -312,5 +312,5 @@
 #ifdef DOXYGEN
 psPtr psMemDecrRefCounter(
-    psPtr vptr                         ///< Pointer to decrement refCounter, and return
+    psPtr ptr                         ///< Pointer to decrement refCounter, and return
 );
 #else // DOXYGEN