Index: trunk/psLib/src/collections/psArray.c
===================================================================
--- trunk/psLib/src/collections/psArray.c	(revision 1406)
+++ trunk/psLib/src/collections/psArray.c	(revision 1407)
@@ -1,2 +1,3 @@
+
 /** @file  psArray.c
  *
@@ -8,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-07 00:06:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,7 +16,9 @@
 
 /******************************************************************************/
+
 /*  INCLUDE FILES                                                             */
+
 /******************************************************************************/
-#include<stdlib.h>            // for qsort, etc.
+#include<stdlib.h>                         // for qsort, etc.
 
 #include "psMemory.h"
@@ -24,26 +27,28 @@
 #include "psLogMsg.h"
 
+/*****************************************************************************/
+
+/*  FUNCTION IMPLEMENTATION - LOCAL                                          */
 
 /*****************************************************************************/
-/*  FUNCTION IMPLEMENTATION - LOCAL                                          */
-/*****************************************************************************/
-static void arrayFree(psArray *restrict psArr);
+static void arrayFree(psArray * restrict psArr);
 
 /*****************************************************************************/
+
 /* FUNCTION IMPLEMENTATION - PUBLIC                                          */
+
 /*****************************************************************************/
-psArray* psArrayAlloc(unsigned int nalloc)
+psArray *psArrayAlloc(unsigned int nalloc)
 {
     psArray *psArr = NULL;
 
     // Invalid nalloc
-    if(nalloc < 1) {
+    if (nalloc < 1) {
         psError(__func__, "Invalid value for nalloc. nalloc: %d\n", nalloc);
         return NULL;
     }
-
     // Create vector struct
-    psArr = (psArray *)psAlloc(sizeof(psArray));
-    p_psMemSetDeallocator(psArr,(psFreeFcn)arrayFree);
+    psArr = (psArray *) psAlloc(sizeof(psArray));
+    p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
 
     psArr->nalloc = nalloc;
@@ -51,38 +56,36 @@
 
     // Create vector data array
-    psArr->data = psAlloc(nalloc*sizeof(psPTR));
+    psArr->data = psAlloc(nalloc * sizeof(psPTR));
 
     return psArr;
 }
 
-psArray *psArrayRealloc(unsigned int nalloc, psArray *restrict in)
+psArray *psArrayRealloc(unsigned int nalloc, psArray * restrict in)
 {
     // Invalid nalloc
-    if(nalloc < 1) {
+    if (nalloc < 1) {
         psError(__func__, "Invalid value for realloc (%d)\n", nalloc);
         return NULL;
     }
 
-    if(in == NULL) {
+    if (in == NULL) {
         psError(__func__, "Null input vector\n");
         return NULL;
-    } else
-        if(in->nalloc != nalloc) {                    // No need to realloc to same size
-            if(nalloc < in->n) {
-                for (int i = nalloc; i < in->n; i++) {   // For reduction in vector size
-                    psFree(in->data[i]);
-                }
-                in->n = nalloc;
+    } else if (in->nalloc != nalloc) {     // No need to realloc to same size
+        if (nalloc < in->n) {
+            for (int i = nalloc; i < in->n; i++) {      // For reduction in vector size
+                psFree(in->data[i]);
             }
-
-            // Realloc after decrementation to avoid accessing freed array elements
-            in->data = psRealloc(in->data,nalloc*sizeof(psPTR));
-            in->nalloc = nalloc;
+            in->n = nalloc;
         }
+        // Realloc after decrementation to avoid accessing freed array elements
+        in->data = psRealloc(in->data, nalloc * sizeof(psPTR));
+        in->nalloc = nalloc;
+    }
 
     return in;
 }
 
-static void arrayFree(psArray *restrict psArr)
+static void arrayFree(psArray * restrict psArr)
 {
     if (psArr == NULL) {
@@ -95,12 +98,12 @@
 }
 
-void psArrayElementFree(psArray *restrict psArr)
+void psArrayElementFree(psArray * restrict psArr)
 {
 
-    if(psArr == NULL) {
+    if (psArr == NULL) {
         return;
     }
 
-    for(int i = 0; i < psArr->n; i++) {
+    for (int i = 0; i < psArr->n; i++) {
         psFree(psArr->data[i]);
         psArr->data[i] = NULL;
@@ -108,5 +111,5 @@
 }
 
-psArray* psArraySort(psArray* in, psComparePtrFcn compare)
+psArray *psArraySort(psArray * in, psComparePtrFcn compare)
 {
     if (in == NULL) {
@@ -114,7 +117,5 @@
     }
 
-    qsort(in->data, in->n, sizeof(psPTR),
-          (int(*)(const void *, const void *))compare);
-
+    qsort(in->data, in->n, sizeof(psPTR), (int (*)(const void *, const void *))compare);
 
     return in;