Index: trunk/psLib/test/collections/tst_psArray.c
===================================================================
--- trunk/psLib/test/collections/tst_psArray.c	(revision 4431)
+++ trunk/psLib/test/collections/tst_psArray.c	(revision 4457)
@@ -17,6 +17,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-17 23:44:22 $
+ *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-07-06 03:04:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -103,10 +103,10 @@
         }
     }
-    fprintf(stderr,"array size = %d\n", psArr->nalloc);
+    fprintf(stderr,"array size = %ld\n", psArr->nalloc);
     if (psArr->nalloc != 5) {
         psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 3;
     }
-    fprintf(stderr,"array population = %d\n", psArr->n);
+    fprintf(stderr,"array population = %ld\n", psArr->n);
     if (psArr->n != 5) {
         psError(PS_ERR_UNKNOWN, true,"Array population wrong");
@@ -137,10 +137,10 @@
         }
     }
-    fprintf(stderr,"array size = %d\n", psArr->nalloc);
+    fprintf(stderr,"array size = %ld\n", psArr->nalloc);
     if (psArr->nalloc != 10) {
         psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 6;
     }
-    fprintf(stderr,"array population = %d\n", psArr->n);
+    fprintf(stderr,"array population = %ld\n", psArr->n);
     if (psArr->n != 10) {
         psError(PS_ERR_UNKNOWN, true,"Array Population wrong");
@@ -160,10 +160,10 @@
         }
     }
-    fprintf(stderr,"array size = %d\n", psArr->nalloc);
+    fprintf(stderr,"array size = %ld\n", psArr->nalloc);
     if (psArr->nalloc != 3) {
         psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 9;
     }
-    fprintf(stderr,"array population = %d\n", psArr->n);
+    fprintf(stderr,"array population = %ld\n", psArr->n);
     if (psArr->n != 3) {
         psError(PS_ERR_UNKNOWN, true,"Array Population wrong");
@@ -189,5 +189,5 @@
         return 100;
     }
-    fprintf(stderr,"Array size after removal = %d\n",psArr->n);
+    fprintf(stderr,"Array size after removal = %ld\n",psArr->n);
     if ( psArr->n != 2 ) {
         psError(PS_ERR_UNKNOWN, true, "Items in array not decremented after removal");
@@ -274,10 +274,10 @@
         }
     }
-    fprintf(stderr,"array size = %d\n", psArr->nalloc);
+    fprintf(stderr,"array size = %ld\n", psArr->nalloc);
     if (psArr->nalloc != 10) {
         psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 3;
     }
-    fprintf(stderr,"array population = %d\n", psArr->n);
+    fprintf(stderr,"array population = %ld\n", psArr->n);
     if (psArr->n != 10) {
         psError(PS_ERR_UNKNOWN, true,"Array population wrong");
Index: trunk/psLib/test/collections/tst_psHash00.c
===================================================================
--- trunk/psLib/test/collections/tst_psHash00.c	(revision 4431)
+++ trunk/psLib/test/collections/tst_psHash00.c	(revision 4457)
@@ -26,5 +26,5 @@
     }
 
-    if (myHashTable->nbucket != NUM_HASH_TABLE_BUCKETS) {
+    if (myHashTable->n != NUM_HASH_TABLE_BUCKETS) {
         fprintf(stderr, "%s: myHashTable->nbucket not set properly.\n",
                 __func__);
Index: trunk/psLib/test/collections/tst_psList.c
===================================================================
--- trunk/psLib/test/collections/tst_psList.c	(revision 4431)
+++ trunk/psLib/test/collections/tst_psList.c	(revision 4457)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-06 03:04:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77,5 +77,5 @@
         return 2;
     }
-    if (list->size != 0) {
+    if (list->n != 0) {
         psError(PS_ERR_UNKNOWN, true,"size of list wasn't zero for empty list.");
         return 3;
@@ -101,5 +101,5 @@
     }
 
-    if (list->size != 1) {
+    if (list->n != 1) {
         psError(PS_ERR_UNKNOWN, true,"size of list wasn't correctly set for new, one-element list.");
         return 7;
@@ -310,5 +310,5 @@
     list = psListAlloc(data);
     psFree(data);
-    if (list->size != 1) {
+    if (list->n != 1) {
         psError(PS_ERR_UNKNOWN, true,"psListAlloc didn't create a list properly.");
         return 2;
@@ -321,5 +321,5 @@
         return 40;
     }
-    if ( list->size != 1) {
+    if ( list->n != 1) {
         psError(PS_ERR_UNKNOWN, true,"psListAdd with a NULL data element changed the list size or returned success.");
         return 3;
@@ -341,5 +341,5 @@
 
     // verify that the size incremented
-    if (list->size != 2) {
+    if (list->n != 2) {
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the size by one");
         return 4;
@@ -365,5 +365,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 3) {
+    if (list->n != 3) {
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the size by 1");
         return 6;
@@ -399,5 +399,5 @@
     psFree(data);
     // verify that the size wasn't incremented
-    if (list->size != 3) {
+    if (list->n != 3) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to head when where was invalid.");
@@ -420,5 +420,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 4 || *(psS32*)list->head->next->data != 5) {
+    if (list->n != 4 || *(psS32*)list->head->next->data != 5) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #1.");
@@ -439,5 +439,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
+    if (list->n != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #4.");
@@ -460,5 +460,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 6  || *(psS32 *)list->tail->prev->prev->data != 7) {
+    if (list->n != 6  || *(psS32 *)list->tail->prev->prev->data != 7) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #2.");
@@ -480,5 +480,5 @@
         return 29;
     }
-    if(list->size != 7 || *(psS32 *)list->tail->data != 8) {
+    if(list->n != 7 || *(psS32 *)list->tail->data != 8) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN,true,"psListAdd didn't place added item at tail.");
@@ -660,5 +660,5 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -682,5 +682,5 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -697,5 +697,5 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -721,5 +721,5 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -736,5 +736,5 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -756,5 +756,5 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -771,5 +771,5 @@
     }
 
-    if (list->size != items) {
+    if (list->n != items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"size not %d, as expected.",items);
@@ -791,5 +791,5 @@
     }
 
-    if (list->size != 0) {
+    if (list->n != 0) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't remove all the elements.");
@@ -835,5 +835,5 @@
     arr = psListToArray(list);
 
-    if (arr->n != 15 || list->size != 15) {
+    if (arr->n != 15 || list->n != 15) {
         psError(PS_ERR_UNKNOWN, true,"The created array didn't have the proper size");
         return 1;
@@ -873,5 +873,5 @@
     list = psArrayToList(arr);
 
-    if (arr->n != 15 || list->size != 15) {
+    if (arr->n != 15 || list->n != 15) {
         psError(PS_ERR_UNKNOWN, true,"The created array didn't have the proper size");
         return 1;
@@ -1112,5 +1112,5 @@
     (not needed, as psListAdd is tested elsewhere, but check anyway.)
     */
-    if (list->size != 15) {
+    if (list->n != 15) {
         psError(PS_ERR_UNKNOWN, true,"List wasn't populated as expected?");
         return 2;
Index: trunk/psLib/test/collections/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 4431)
+++ trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 4457)
@@ -13,6 +13,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-10 18:09:12 $
+ *  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-07-06 03:04:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -263,5 +263,5 @@
         // Search list for another entry with same key name
         // Check if last entry
-        if(iter->index != metadataItemList->size) {
+        if(iter->index != metadataItemList->n) {
             // Set search iterator to index
             if(!psListIteratorSet(searchIter,iter->index) ) {
@@ -422,7 +422,7 @@
 
     // Verify the number of items in metadata
-    if(md->list->size != expectedItems) {
+    if(md->list->n != expectedItems) {
         psError(PS_ERR_UNKNOWN,true,"File: %s : Number of items = %d not as expected %d",
-                configFile,md->list->size, expectedItems);
+                configFile,md->list->n, expectedItems);
         returnValue = false;
     }
@@ -795,7 +795,7 @@
             if(metaCounter == 0) {
                 // Check if number of items is as expected
-                if(entryChild->data.md->list->size != testConfig1ValueMetaItems1) {
+                if(entryChild->data.md->list->n != testConfig1ValueMetaItems1) {
                     psError(PS_ERR_UNKNOWN,true,"File: %s : Metadata 1 items %d not as expected %d",
-                            testConfig1,entryChild->data.md->list->size,testConfig1ValueMetaItems1);
+                            testConfig1,entryChild->data.md->list->n,testConfig1ValueMetaItems1);
                     return i*10+6;
                 }
@@ -824,7 +824,7 @@
             } else if(metaCounter == 1) {
                 // Check if number of items is as expected
-                if(entryChild->data.md->list->size != testConfig1ValueMetaItems2) {
+                if(entryChild->data.md->list->n != testConfig1ValueMetaItems2) {
                     psError(PS_ERR_UNKNOWN,true,"File: %s : Metadata 2 items %d not as expected %d",
-                            testConfig1,entryChild->data.md->list->size,testConfig1ValueMetaItems2);
+                            testConfig1,entryChild->data.md->list->n,testConfig1ValueMetaItems2);
                     return i*10+6;
                 }
@@ -853,7 +853,7 @@
             } else if(metaCounter == 2) {
                 // Check if number of items is as expected
-                if(entryChild->data.md->list->size != testConfig1ValueMetaItems3) {
+                if(entryChild->data.md->list->n != testConfig1ValueMetaItems3) {
                     psError(PS_ERR_UNKNOWN,true,"File: %s : Metadata 3 items %d not as expected %d",
-                            testConfig1,entryChild->data.md->list->size,testConfig1ValueMetaItems3);
+                            testConfig1,entryChild->data.md->list->n,testConfig1ValueMetaItems3);
                     return i*10+6;
                 }
Index: trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 4431)
+++ trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 4457)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.25 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-04-28 02:45:12 $
+*  @version $Revision: 1.26 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-07-06 03:04:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -60,5 +60,5 @@
     psS32 i;
     psHashBucket* ptr = NULL;
-    for(i=0; i<mdTable->nbucket; i++) {
+    for(i=0; i<mdTable->n; i++) {
         ptr = mdTable->buckets[i];
         while (ptr != NULL) {