Index: trunk/psLib/src/sys/psMemory.c
===================================================================
--- trunk/psLib/src/sys/psMemory.c	(revision 4578)
+++ trunk/psLib/src/sys/psMemory.c	(revision 4589)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -102,5 +102,7 @@
 }
 
-static void memProblemCallbackDefault( psMemBlock* ptr, const char *file, unsigned int lineno)
+static void memProblemCallbackDefault(psMemBlock* ptr,
+                                      const char *file,
+                                      unsigned int lineno)
 {
     if (ptr->refCounter < 1) {
@@ -120,5 +122,6 @@
  * N.b. If the block wasn't allocated by psAlloc, it will appear corrupted
  */
-static psS32 checkMemBlock(const psMemBlock* m, const char *funcName)
+static psS32 checkMemBlock(const psMemBlock* m,
+                           const char *funcName)
 {
     // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked,
@@ -286,5 +289,7 @@
 }
 
-psPtr p_psAlloc(size_t size, const char *file, unsigned int lineno)
+psPtr p_psAlloc(size_t size,
+                const char *file,
+                unsigned int lineno)
 {
 
@@ -370,5 +375,8 @@
 }
 
-psPtr p_psRealloc(psPtr vptr, size_t size, const char *file, unsigned int lineno)
+psPtr p_psRealloc(psPtr vptr,
+                  size_t size,
+                  const char *file,
+                  unsigned int lineno)
 {
     size = (size < recycleBinSize[0]) ? recycleBinSize[0] : size; // set the minimum size to allocate
@@ -424,5 +432,7 @@
 }
 
-void p_psFree(psPtr vptr, const char *file, unsigned int lineno)
+void p_psFree(psPtr vptr,
+              const char *filename,
+              unsigned int lineno)
 {
     if (vptr == NULL) {
@@ -434,13 +444,13 @@
 
         psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                ptr->id, ptr->file, ptr->lineno, file, lineno);
+                ptr->id, ptr->file, ptr->lineno, filename, lineno);
     }
 
     if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, file, lineno);
+        memProblemCallback(ptr, filename, lineno);
         psAbort(__func__,"Memory Corruption Detected.");
     }
 
-    (void)p_psMemDecrRefCounter(vptr, file, lineno);    // this handles the free, if required.
+    (void)p_psMemDecrRefCounter(vptr, filename, lineno);    // this handles the free, if required.
 }
 
@@ -448,5 +458,8 @@
  * Check for memory leaks.
  */
-psS32 psMemCheckLeaks(psMemId id0, psMemBlock* ** arr, FILE * fd, psBool persistence)
+int psMemCheckLeaks(psMemId id0,
+                    psMemBlock* ** arr,
+                    FILE * fd,
+                    psBool persistence)
 {
     psS32 nleak = 0;
@@ -527,5 +540,7 @@
 
 // increment and return refCounter
-psPtr p_psMemIncrRefCounter(psPtr vptr, const char *file, psS32 lineno)
+psPtr p_psMemIncrRefCounter(psPtr vptr,
+                            const char *file,
+                            psS32 lineno)
 {
     psMemBlock* ptr;
@@ -549,5 +564,7 @@
 
 // decrement and return refCounter
-psPtr p_psMemDecrRefCounter(psPtr vptr, const char *file, psS32 lineno)
+psPtr p_psMemDecrRefCounter(psPtr vptr,
+                            const char *file,
+                            psS32 lineno)
 {
     if (vptr == NULL) {
@@ -640,5 +657,6 @@
 }
 
-void psMemSetDeallocator(psPtr ptr, psFreeFunc freeFunc)
+void psMemSetDeallocator(psPtr ptr,
+                         psFreeFunc freeFunc)
 {
     if (ptr == NULL) {
@@ -655,5 +673,5 @@
 
 }
-psFreeFunc psMemGetDeallocator(psPtr ptr)
+psFreeFunc psMemGetDeallocator(const psPtr ptr)
 {
     if (ptr == NULL) {
@@ -685,5 +703,6 @@
 }
 
-void p_psMemSetPersistent(psPtr vptr, bool value)
+void p_psMemSetPersistent(psPtr vptr,
+                          bool value)
 {
     if (vptr == NULL) {
Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 4578)
+++ trunk/psLib/src/sys/psMemory.h	(revision 4589)
@@ -12,6 +12,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-18 20:54:22 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -169,5 +169,5 @@
  */
 psFreeFunc psMemGetDeallocator(
-    psPtr ptr                          ///< the memory block
+    const psPtr ptr                          ///< the memory block
 );
 
@@ -239,5 +239,5 @@
 void p_psFree(
     psPtr ptr,                         ///< Pointer to free
-    const char *file,                  ///< File of call
+    const char *filename,              ///< File of call
     unsigned int lineno                ///< Line number of call
 );
@@ -260,10 +260,10 @@
  *  If memory leaks are found, the Memory Problem callback will be called as well.
  *
- *  return psS32  number of memory blocks found as 'leaks', i.e., the number of currently allocated memory
+ *  @return int  number of memory blocks found as 'leaks', i.e., the number of currently allocated memory
  *              blocks above id0 that have not been freed.
  *  @see psAlloc, psFree, psgetMemId, psMemProblemCallbackSet
  *  @ingroup memTracing
  */
-psS32 psMemCheckLeaks(
+int psMemCheckLeaks(
     psMemId id0,                       ///< don't list blocks with id < id0
     psMemBlock* ** arr,                ///< pointer to array of pointers to leaked blocks, or NULL
@@ -275,4 +275,6 @@
  *  i.e., invalid markers that signify a buffer under/overflow.
  *
+ *  @return int
+ *
  *  @ingroup memTracing
  */
@@ -283,4 +285,6 @@
 /** Return reference counter
  *
+ *  @return psReferenceCount
+ *
  *  @ingroup memRefCount
  */
@@ -290,4 +294,6 @@
 
 /** Increment reference counter and return the pointer
+ *
+ *  @return psPtr
  *
  *  @ingroup memRefCount