Index: /trunk/psLib/src/collections/psArray.c
===================================================================
--- /trunk/psLib/src/collections/psArray.c	(revision 4306)
+++ /trunk/psLib/src/collections/psArray.c	(revision 4307)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109,10 +109,10 @@
 }
 
-psBool psArrayRemove(psArray* psArr,
-                     psPtr data)
-{
-    psBool success = false;
-
-    if (psArr == NULL) {
+bool psArrayRemove(psArray* array,
+                   const psPtr data)
+{
+    bool success = false;
+
+    if (array == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psArray_ARRAY_NULL);
@@ -120,14 +120,14 @@
     }
 
-    psS32 n = psArr->n;
-    psPtr* psArrData = psArr->data;
+    psS32 n = array->n;
+    psPtr* psArrData = array->data;
     for (psS32 i = n-1; i >= 0; i--) {
         if (psArrData[i] == data) {
-            memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
+            memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
             n--;
             success = true;
         }
     }
-    psArr->n = n; // reset the array size to indicate the removed item(s)
+    array->n = n; // reset the array size to indicate the removed item(s)
 
     return success;
Index: /trunk/psLib/src/collections/psArray.h
===================================================================
--- /trunk/psLib/src/collections/psArray.h	(revision 4306)
+++ /trunk/psLib/src/collections/psArray.h	(revision 4307)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91,7 +91,7 @@
  *
  */
-psBool psArrayRemove(
-    psArray* psArr,                    ///< array to operate on
-    psPtr data                         ///< the data pointer to remove from psArray
+bool psArrayRemove(
+    psArray* array,                    ///< array to operate on
+    const psPtr data                   ///< the data pointer to remove from psArray
 );
 
Index: /trunk/psLib/src/sys/psAbort.c
===================================================================
--- /trunk/psLib/src/sys/psAbort.c	(revision 4306)
+++ /trunk/psLib/src/sys/psAbort.c	(revision 4307)
@@ -10,6 +10,6 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,13 +21,13 @@
 #include "psLogMsg.h"
 
-void psAbort(const char *name, const char *fmt, ...)
+void psAbort(const char *name, const char *format, ...)
 {
     va_list argPtr;             // variable list arguement pointer
 
     // Get the variable list parameters to pass to logging function
-    va_start(argPtr, fmt);
+    va_start(argPtr, format);
 
     // Call logging function with PS_LOG_ABORT level
-    psLogMsgV(name, PS_LOG_ABORT, fmt, argPtr);
+    psLogMsgV(name, PS_LOG_ABORT, format, argPtr);
 
     // Clean up stack after variable arguement has been used
Index: /trunk/psLib/src/sys/psAbort.h
===================================================================
--- /trunk/psLib/src/sys/psAbort.h	(revision 4306)
+++ /trunk/psLib/src/sys/psAbort.h	(revision 4307)
@@ -12,6 +12,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,5 @@
 void psAbort(
     const char *name,                  ///< Source of abort such as file or function detected
-    const char *fmt,                   ///< A printf style formatting statement defining msg
+    const char *format,                   ///< A printf style formatting statement defining msg
     ...
 );
Index: /trunk/psLib/src/sysUtils/psAbort.c
===================================================================
--- /trunk/psLib/src/sysUtils/psAbort.c	(revision 4306)
+++ /trunk/psLib/src/sysUtils/psAbort.c	(revision 4307)
@@ -10,6 +10,6 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,13 +21,13 @@
 #include "psLogMsg.h"
 
-void psAbort(const char *name, const char *fmt, ...)
+void psAbort(const char *name, const char *format, ...)
 {
     va_list argPtr;             // variable list arguement pointer
 
     // Get the variable list parameters to pass to logging function
-    va_start(argPtr, fmt);
+    va_start(argPtr, format);
 
     // Call logging function with PS_LOG_ABORT level
-    psLogMsgV(name, PS_LOG_ABORT, fmt, argPtr);
+    psLogMsgV(name, PS_LOG_ABORT, format, argPtr);
 
     // Clean up stack after variable arguement has been used
Index: /trunk/psLib/src/sysUtils/psAbort.h
===================================================================
--- /trunk/psLib/src/sysUtils/psAbort.h	(revision 4306)
+++ /trunk/psLib/src/sysUtils/psAbort.h	(revision 4307)
@@ -12,6 +12,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,5 @@
 void psAbort(
     const char *name,                  ///< Source of abort such as file or function detected
-    const char *fmt,                   ///< A printf style formatting statement defining msg
+    const char *format,                   ///< A printf style formatting statement defining msg
     ...
 );
Index: /trunk/psLib/src/types/psArray.c
===================================================================
--- /trunk/psLib/src/types/psArray.c	(revision 4306)
+++ /trunk/psLib/src/types/psArray.c	(revision 4307)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109,10 +109,10 @@
 }
 
-psBool psArrayRemove(psArray* psArr,
-                     psPtr data)
-{
-    psBool success = false;
-
-    if (psArr == NULL) {
+bool psArrayRemove(psArray* array,
+                   const psPtr data)
+{
+    bool success = false;
+
+    if (array == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psArray_ARRAY_NULL);
@@ -120,14 +120,14 @@
     }
 
-    psS32 n = psArr->n;
-    psPtr* psArrData = psArr->data;
+    psS32 n = array->n;
+    psPtr* psArrData = array->data;
     for (psS32 i = n-1; i >= 0; i--) {
         if (psArrData[i] == data) {
-            memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
+            memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
             n--;
             success = true;
         }
     }
-    psArr->n = n; // reset the array size to indicate the removed item(s)
+    array->n = n; // reset the array size to indicate the removed item(s)
 
     return success;
Index: /trunk/psLib/src/types/psArray.h
===================================================================
--- /trunk/psLib/src/types/psArray.h	(revision 4306)
+++ /trunk/psLib/src/types/psArray.h	(revision 4307)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91,7 +91,7 @@
  *
  */
-psBool psArrayRemove(
-    psArray* psArr,                    ///< array to operate on
-    psPtr data                         ///< the data pointer to remove from psArray
+bool psArrayRemove(
+    psArray* array,                    ///< array to operate on
+    const psPtr data                   ///< the data pointer to remove from psArray
 );