Index: trunk/psLib/test/collections/tst_psArray.c
===================================================================
--- trunk/psLib/test/collections/tst_psArray.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psArray.c	(revision 2273)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43,5 +43,5 @@
     psArray *psArr = psArrayAlloc(5);
     if (psArr->nalloc != 5) {
-        psError(__func__,"psArray didn't have proper number of elements.");
+        psError(PS_ERR_UNKNOWN, true,"psArray didn't have proper number of elements.");
         return 1;
     }
@@ -64,5 +64,5 @@
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
         if (fabsf(ts->x - 10*i) > 0.01f || fabsf(ts->y - 10.1*i) > 0.01f) {
-            psError(__func__,"Couldn't properly get elements from array.");
+            psError(PS_ERR_UNKNOWN, true,"Couldn't properly get elements from array.");
             return 2;
         }
@@ -70,10 +70,10 @@
     printf("array size = %d\n", psArr->nalloc);
     if (psArr->nalloc != 5) {
-        psError(__func__,"Array Size wrong");
+        psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 3;
     }
     printf("array population = %d\n", psArr->n);
     if (psArr->n != 5) {
-        psError(__func__,"Array population wrong");
+        psError(PS_ERR_UNKNOWN, true,"Array population wrong");
         return 4;
     }
@@ -98,5 +98,5 @@
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
         if (fabsf(ts->x - 10*i) > 0.01f || fabsf(ts->y - 10.1*i) > 0.01f) {
-            psError(__func__,"Couldn't properly get elements from array.");
+            psError(PS_ERR_UNKNOWN, true,"Couldn't properly get elements from array.");
             return 5;
         }
@@ -104,10 +104,10 @@
     printf("array size = %d\n", psArr->nalloc);
     if (psArr->nalloc != 10) {
-        psError(__func__,"Array Size wrong");
+        psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 6;
     }
     printf("array population = %d\n", psArr->n);
     if (psArr->n != 10) {
-        psError(__func__,"Array Population wrong");
+        psError(PS_ERR_UNKNOWN, true,"Array Population wrong");
         return 7;
     }
@@ -122,5 +122,5 @@
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
         if (fabsf(ts->x - 10*i) > 0.01f || fabsf(ts->y - 10.1*i) > 0.01f) {
-            psError(__func__,"Couldn't properly get elements from array.");
+            psError(PS_ERR_UNKNOWN, true,"Couldn't properly get elements from array.");
             return 8;
         }
@@ -128,10 +128,10 @@
     printf("array size = %d\n", psArr->nalloc);
     if (psArr->nalloc != 3) {
-        psError(__func__,"Array Size wrong");
+        psError(PS_ERR_UNKNOWN, true,"Array Size wrong");
         return 9;
     }
     printf("array population = %d\n", psArr->n);
     if (psArr->n != 3) {
-        psError(__func__,"Array Population wrong");
+        psError(PS_ERR_UNKNOWN, true,"Array Population wrong");
         return 10;
     }
Index: trunk/psLib/test/collections/tst_psList.c
===================================================================
--- trunk/psLib/test/collections/tst_psList.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psList.c	(revision 2273)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -44,5 +44,5 @@
 
     if (! runTestSuite(stderr,"psList",tests,argc,argv) ) {
-        psError(__FILE__,"One or more tests failed");
+        psError(PS_ERR_UNKNOWN,true,"One or more tests failed");
         return 1;
     }
@@ -66,15 +66,15 @@
     list = psListAlloc(NULL);
     if (list == NULL) {
-        psError(__func__,"psListAlloc failed to return a list.");
+        psError(PS_ERR_UNKNOWN, true,"psListAlloc failed to return a list.");
         return 1;
     }
 
     if (list->head != NULL || list->tail != NULL) {
-        psError(__func__,"head and/or tail was not NULL for empty list.");
+        psError(PS_ERR_UNKNOWN, true,"head and/or tail was not NULL for empty list.");
         return 2;
     }
 
     if (list->size != 0) {
-        psError(__func__,"size of list wasn't zero for empty list.");
+        psError(PS_ERR_UNKNOWN, true,"size of list wasn't zero for empty list.");
         return 3;
     }
@@ -84,20 +84,20 @@
     list = psListAlloc(data);
     if (list == NULL) {
-        psError(__func__,"psListAlloc failed to return a list.");
+        psError(PS_ERR_UNKNOWN, true,"psListAlloc failed to return a list.");
         return 4;
     }
 
     if (list->head == NULL || list->tail == NULL) {
-        psError(__func__,"head and/or tail was NULL for one-element new list.");
+        psError(PS_ERR_UNKNOWN, true,"head and/or tail was NULL for one-element new list.");
         return 5;
     }
 
     if (list->head->data != data || list->tail->data != data) {
-        psError(__func__,"head and/or tail didn't point to data's node for one-element new list.");
+        psError(PS_ERR_UNKNOWN, true,"head and/or tail didn't point to data's node for one-element new list.");
         return 6;
     }
 
     if (list->size != 1) {
-        psError(__func__,"size of list wasn't correctly set for new, one-element list.");
+        psError(PS_ERR_UNKNOWN, true,"size of list wasn't correctly set for new, one-element list.");
         return 7;
     }
@@ -105,5 +105,5 @@
     ref = psMemGetRefCounter(data);
     if (ref != 2) {
-        psError(__func__,"psList didn't increment reference count of data (%d.",ref);
+        psError(PS_ERR_UNKNOWN, true,"psList didn't increment reference count of data (%d.",ref);
         return 8;
     }
@@ -139,5 +139,5 @@
     //  1. list is NULL (error)
     if (psListAdd(NULL,PS_LIST_HEAD,data)) {
-        psError(__func__,"psListAdd was given a NULL list, but returned a true/success.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd was given a NULL list, but returned a true/success.");
         return 1;
     }
@@ -146,5 +146,5 @@
     psFree(data);
     if (list->size != 1) {
-        psError(__func__,"psListAlloc didn't create a list properly.");
+        psError(PS_ERR_UNKNOWN, true,"psListAlloc didn't create a list properly.");
         return 2;
     }
@@ -152,9 +152,9 @@
     //  2. data is NULL (error, list should not grow)
     if (psListAdd(list, PS_LIST_HEAD,NULL)) {
-        psError(__func__,"psListAdd successfully added a NULL data item?");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd successfully added a NULL data item?");
         return 40;
     }
     if ( list->size != 1) {
-        psError(__func__,"psListAdd with a NULL data element changed the list size or returned success.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd with a NULL data element changed the list size or returned success.");
         return 3;
     }
@@ -164,10 +164,10 @@
     *data = 2;
     if ( ! psListAdd(list,PS_LIST_HEAD,data) ) {
-        psError(__func__,"psListAdd failed to add a data item to head.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd failed to add a data item to head.");
         return 21;
     }
 
     if (psMemGetRefCounter(data) != 2) {
-        psError(__func__,"psListAdd didn't increment the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the data reference count.");
         return 20;
     }
@@ -176,5 +176,5 @@
     // verify that the size incremented
     if (list->size != 2) {
-        psError(__func__,"psListAdd didn't increment the size by one");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the size by one");
         return 4;
     }
@@ -182,5 +182,5 @@
     // verify that the head is the inserted data item
     if (*(psS32*)list->head->data != 2) {
-        psError(__func__,"psListAdd with PS_LIST_HEAD didn't insert at the head.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd with PS_LIST_HEAD didn't insert at the head.");
         return 5;
     }
@@ -189,10 +189,10 @@
     *data = 3;
     if ( ! psListAdd(list,PS_LIST_TAIL,data) ) {
-        psError(__func__,"psListAdd failed to add a data item to tail.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd failed to add a data item to tail.");
         return 21;
     }
 
     if (psMemGetRefCounter(data) != 2) {
-        psError(__func__,"psListAdd didn't increment the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the data reference count.");
         return 22;
     }
@@ -200,5 +200,5 @@
     // verify that the size incremented
     if (list->size != 3) {
-        psError(__func__,"psListAdd didn't increment the size by 1");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the size by 1");
         return 6;
     }
@@ -206,5 +206,5 @@
     // verify that the head is still the same
     if (*(psS32*)list->head->data != 2) {
-        psError(__func__,"psListAdd with PS_LIST_TAIL modified the head.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd with PS_LIST_TAIL modified the head.");
         return 7;
     }
@@ -212,5 +212,5 @@
     // verify that the tail is the data item inserted
     if (*(psS32*)list->tail->data != 3) {
-        psError(__func__,"psListAdd with PS_LIST_TAIL didn't insert at the tail.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd with PS_LIST_TAIL didn't insert at the tail.");
         return 8;
     }
@@ -223,9 +223,9 @@
 
     if ( psListAdd(list,-10,data) ) {
-        psError(__func__,"psListAdd successfully added data to a -10 position?");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd successfully added data to a -10 position?");
         return 30;
     }
     if (psMemGetRefCounter(data) != 1) {
-        psError(__func__,"psListAdd incremented the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd incremented the data reference count.");
         return 24;
     }
@@ -234,5 +234,5 @@
     if (list->size != 3) {
         printListInt(list);
-        psError(__func__,"psListAdd didn't insert to head when where was invalid.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to head when where was invalid.");
         return 9;
     }
@@ -243,10 +243,10 @@
 
     if ( ! psListAdd(list,1,data) ) {
-        psError(__func__,"psListAdd failed to add data to 1 position.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd failed to add data to 1 position.");
         return 30;
     }
 
     if (psMemGetRefCounter(data) != 2) {
-        psError(__func__,"psListAdd didn't increment the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the data reference count.");
         return 25;
     }
@@ -255,5 +255,5 @@
     if (list->size != 4 || *(psS32*)list->head->next->data != 5) {
         printListInt(list);
-        psError(__func__,"psListAdd didn't insert to position #1.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #1.");
         return 10;
     }
@@ -262,9 +262,9 @@
     *data = 6;
     if ( ! psListAdd(list,3,data) ) {
-        psError(__func__,"psListAdd failed to add data to 4 position.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd failed to add data to 4 position.");
         return 31;
     }
     if (psMemGetRefCounter(data) != 2) {
-        psError(__func__,"psListAdd didn't increment the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the data reference count.");
         return 26;
     }
@@ -273,5 +273,5 @@
     if (list->size != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
         printListInt(list);
-        psError(__func__,"psListAdd didn't insert to position #4.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #4.");
         return 50;
     }
@@ -280,9 +280,9 @@
     *data = 7;
     if ( ! psListAdd(list,2,data) ) {
-        psError(__func__,"psListAdd failed to add data to 2 position.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd failed to add data to 2 position.");
         return 32;
     }
     if (psMemGetRefCounter(data) != 2) {
-        psError(__func__,"psListAdd didn't increment the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the data reference count.");
         return 28;
     }
@@ -291,5 +291,5 @@
     if (list->size != 6  || *(psS32 *)list->head->next->next->data != 7) {
         printListInt(list);
-        psError(__func__,"psListAdd didn't insert to position #2.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #2.");
         return 11;
     }
@@ -300,10 +300,10 @@
 
     if ( ! psListAdd(list,9,data) ) {
-        psError(__func__,"psListAdd failed to add data to a 9 position?");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd failed to add data to a 9 position?");
         return 30;
     }
 
     if (psMemGetRefCounter(data) != 2) {
-        psError(__func__,"psListAdd didn't increment the data reference count.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the data reference count.");
         return 29;
     }
@@ -314,5 +314,5 @@
     if (list->size != 7) {
         printListInt(list);
-        psError(__func__,"psListAdd didn't insert to position #9.");
+        psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #9.");
         return 12;
     }
@@ -366,5 +366,5 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error");
     if (psListGet(list,PS_LIST_HEAD) != NULL) {
-        psError(__func__,"psListGet didn't return NULL given a NULL list.");
+        psError(PS_ERR_UNKNOWN, true,"psListGet didn't return NULL given a NULL list.");
         return 1;
     };
@@ -394,10 +394,10 @@
     data = (psS32*)psListGet(list,3);
     if (data == NULL || *data != 3) {
-        psError(__func__,"psListGet failed with which=3");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=3");
         return 2;
     }
     data = (psS32*)psListGet(list,1);
     if (data == NULL || *data != 1) {
-        psError(__func__,"psListGet failed with which=1");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=1");
         return 3;
     }
@@ -406,10 +406,10 @@
     data = (psS32*)psListGet(list,5);
     if (data != NULL) {
-        psError(__func__,"psListGet failed with which=5");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=5");
         return 4;
     }
     data = (psS32*)psListGet(list,4);
     if (data != NULL) {
-        psError(__func__,"psListGet failed with which=4");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=4");
         return 5;
     }
@@ -418,5 +418,5 @@
     data = (psS32*)psListGet(list,PS_LIST_HEAD);
     if (data == NULL || *data != 0) {
-        psError(__func__,"psListGet failed with which=PS_LIST_HEAD");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=PS_LIST_HEAD");
         return 6;
     }
@@ -425,5 +425,5 @@
     data = (psS32*)psListGet(list,PS_LIST_NEXT);
     if (data == NULL || *data != 1) {
-        psError(__func__,"psListGet failed with which=PS_LIST_NEXT");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=PS_LIST_NEXT");
         return 7;
     }
@@ -432,5 +432,5 @@
     data = (psS32*)psListGet(list,PS_LIST_TAIL);
     if (data == NULL || *data != 3) {
-        psError(__func__,"psListGet failed with which=PS_LIST_TAIL");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=PS_LIST_TAIL");
         return 8;
     }
@@ -439,5 +439,5 @@
     data = (psS32*)psListGet(list,PS_LIST_PREVIOUS);
     if (data == NULL || *data != 2) {
-        psError(__func__,"psListGet failed with which=PS_LIST_PREV");
+        psError(PS_ERR_UNKNOWN, true,"psListGet failed with which=PS_LIST_PREV");
         return 9;
     }
@@ -473,5 +473,5 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error");
     if (psListRemove(list,PS_LIST_HEAD,NULL)) {
-        psError(__func__,"psListRemove didn't return false given a NULL list.");
+        psError(PS_ERR_UNKNOWN, true,"psListRemove didn't return false given a NULL list.");
         return 1;
     };
@@ -493,5 +493,5 @@
             (psListGet(list,PS_LIST_HEAD) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_HEAD");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_HEAD");
         return 1;
     }
@@ -499,5 +499,5 @@
     if (list->size != 14) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 14.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 14.");
         return 1;
     }
@@ -508,5 +508,5 @@
             (psListGet(list,PS_LIST_TAIL) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_TAIL");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_TAIL");
         return 1;
     }
@@ -514,5 +514,5 @@
     if (list->size != 13) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 13.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 13.");
         return 1;
     }
@@ -522,5 +522,5 @@
     if (! psListRemove(list,PS_LIST_NEXT,NULL)) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_NEXT @ PS_LIST_HEAD");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_NEXT @ PS_LIST_HEAD");
         return 1;
     }
@@ -528,5 +528,5 @@
     if (list->size != 12) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 12.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 12.");
         return 1;
     }
@@ -536,5 +536,5 @@
     if (psListRemove(list,PS_LIST_NEXT,NULL)) {
         printListInt(list);
-        psError(__func__,"Removed something with PS_LIST_NEXT @ PS_LIST_TAIL");
+        psError(PS_ERR_UNKNOWN, true,"Removed something with PS_LIST_NEXT @ PS_LIST_TAIL");
         return 1;
     }
@@ -545,5 +545,5 @@
             ( psListGet(list,3) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_NEXT @ which=2");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_NEXT @ which=2");
         return 1;
     }
@@ -551,5 +551,5 @@
     if (list->size != 11) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 11.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 11.");
         return 1;
     }
@@ -560,5 +560,5 @@
     if (psListRemove(list,PS_LIST_PREVIOUS,NULL)) {
         printListInt(list);
-        psError(__func__,"removed something for PS_LIST_PREVIOUS @ PS_LIST_HEAD");
+        psError(PS_ERR_UNKNOWN, true,"removed something for PS_LIST_PREVIOUS @ PS_LIST_HEAD");
         return 1;
     }
@@ -569,5 +569,5 @@
             (psListGet(list,9) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_PREVIOUS @ PS_LIST_TAIL");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_PREVIOUS @ PS_LIST_TAIL");
         return 1;
     }
@@ -575,5 +575,5 @@
     if (list->size != 10) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 10.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 10.");
         return 1;
     }
@@ -584,5 +584,5 @@
             ( psListGet(list,1) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_PREVIOUS @ which=2");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_PREVIOUS @ which=2");
         return 1;
     }
@@ -590,5 +590,5 @@
     if (list->size != 9) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 9.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 9.");
         return 1;
     }
@@ -598,5 +598,5 @@
     if (psListRemove(list,PS_LIST_UNKNOWN,NULL)) {
         printListInt(list);
-        psError(__func__,"removed something for PS_LIST_UNKNOWN with data=NULL");
+        psError(PS_ERR_UNKNOWN, true,"removed something for PS_LIST_UNKNOWN with data=NULL");
         return 1;
     }
@@ -607,5 +607,5 @@
             (psListGet(list,PS_LIST_HEAD) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_UNKNOWN @ PS_LIST_HEAD");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_UNKNOWN @ PS_LIST_HEAD");
         return 1;
     }
@@ -613,5 +613,5 @@
     if (list->size != 8) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 8.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 8.");
         return 1;
     }
@@ -621,5 +621,5 @@
             (psListGet(list,PS_LIST_TAIL) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_UNKNOWN @ PS_LIST_TAIL");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_UNKNOWN @ PS_LIST_TAIL");
         return 1;
     }
@@ -627,5 +627,5 @@
     if (list->size != 7) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 7.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 7.");
         return 1;
     }
@@ -637,5 +637,5 @@
             (psListGet(list,1) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove PS_LIST_UNKNOWN @ which=1");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove PS_LIST_UNKNOWN @ which=1");
         return 1;
     }
@@ -643,5 +643,5 @@
     if (list->size != 6) {
         printListInt(list);
-        psError(__func__,"Didn't decrement size properly to 6.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to 6.");
         return 1;
     }
@@ -651,5 +651,5 @@
     if ( psListRemove(list,PS_LIST_UNKNOWN,data) ) {
         printListInt(list);
-        psError(__func__,"removed something for PS_LIST_UNKNOWN with previously removed item");
+        psError(PS_ERR_UNKNOWN, true,"removed something for PS_LIST_UNKNOWN with previously removed item");
         return 1;
     }
@@ -666,5 +666,5 @@
             (psListGet(list,PS_LIST_HEAD) == data) ) {
         printListInt(list);
-        psError(__func__,"Failed to remove last element");
+        psError(PS_ERR_UNKNOWN, true,"Failed to remove last element");
         return 1;
     }
@@ -672,5 +672,5 @@
     if (list->size != 0) {
         printListInt(list);
-        psError(__func__,"Didn't remove all the elements.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't remove all the elements.");
         return 1;
     }
@@ -709,20 +709,20 @@
 
     if (arr->n != 15 || list->size != 15) {
-        psError(__func__,"The created array didn't have the proper size");
+        psError(PS_ERR_UNKNOWN, true,"The created array didn't have the proper size");
         return 1;
     }
     for (psS32 i=0;i<arr->n;i++) {
         if (i != *(psS32*)arr->data[i]) {
-            psError(__func__,"Element %d of array is incorrect (%d).",
+            psError(PS_ERR_UNKNOWN, true,"Element %d of array is incorrect (%d).",
                     i,*(psS32*)arr->data[i]);
             return 1;
         }
         if (i != *(psS32*)psListGet(list,i)) {
-            psError(__func__,"Element %d of list is incorrect (%d).",
+            psError(PS_ERR_UNKNOWN, true,"Element %d of list is incorrect (%d).",
                     i,*(psS32*)arr->data[i]);
             return 1;
         }
         if (psMemGetRefCounter(arr->data[i]) != 2) {
-            psError(__func__,"Element %d had wrong reference count (%d).",
+            psError(PS_ERR_UNKNOWN, true,"Element %d had wrong reference count (%d).",
                     i,psMemGetRefCounter(arr->data[i]));
             return 1;
@@ -747,20 +747,20 @@
 
     if (arr->n != 15 || list->size != 15) {
-        psError(__func__,"The created array didn't have the proper size");
+        psError(PS_ERR_UNKNOWN, true,"The created array didn't have the proper size");
         return 1;
     }
     for (psS32 i=0;i<arr->n;i++) {
         if (i != *(psS32*)arr->data[i]) {
-            psError(__func__,"Element %d of array is incorrect (%d).",
+            psError(PS_ERR_UNKNOWN, true,"Element %d of array is incorrect (%d).",
                     i,*(psS32*)arr->data[i]);
             return 1;
         }
         if (i != *(psS32*)psListGet(list,i)) {
-            psError(__func__,"Element %d of list is incorrect (%d).",
+            psError(PS_ERR_UNKNOWN, true,"Element %d of list is incorrect (%d).",
                     i,*(psS32*)arr->data[i]);
             return 1;
         }
         if (psMemGetRefCounter(arr->data[i]) != 2) {
-            psError(__func__,"Element %d had wrong reference count (%d).",
+            psError(PS_ERR_UNKNOWN, true,"Element %d had wrong reference count (%d).",
                     i,psMemGetRefCounter(arr->data[i]));
             return 1;
@@ -775,5 +775,5 @@
     arr = psListToArray(NULL);
     if (arr != NULL) {
-        psError(__func__,"psListToArray didn't return NULL when given NULL");
+        psError(PS_ERR_UNKNOWN, true,"psListToArray didn't return NULL when given NULL");
         return 1;
     }
@@ -781,5 +781,5 @@
     list = psArrayToList(NULL);
     if (list != NULL) {
-        psError(__func__,"psArrayToList didn't return NULL when given NULL");
+        psError(PS_ERR_UNKNOWN, true,"psArrayToList didn't return NULL when given NULL");
         return 1;
     }
@@ -790,5 +790,5 @@
     list = psArrayToList(arr);
     if (list == NULL) {
-        psError(__func__,"psArrayToList didn't create an empty list from an "
+        psError(PS_ERR_UNKNOWN, true,"psArrayToList didn't create an empty list from an "
                 "empty array.");
         return 1;
@@ -800,5 +800,5 @@
     arr = psListToArray(list);
     if (arr == NULL) {
-        psError(__func__,"psArrayToList didn't create an empty array from an "
+        psError(PS_ERR_UNKNOWN, true,"psArrayToList didn't create an empty array from an "
                 "empty list.");
         return 1;
@@ -853,5 +853,5 @@
     psListSetIterator(list,PS_LIST_TAIL);
     if (*(psS32*)psListGetCurrent(list) != 14) {
-        psError(__func__,"Didn't successfully move cursor to tail.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't successfully move cursor to tail.");
         return 1;
     }
@@ -860,5 +860,5 @@
     psListSetIterator(list,PS_LIST_HEAD);
     if (*(psS32*)psListGetCurrent(list) != 0) {
-        psError(__func__,"Didn't successfully move cursor to head.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't successfully move cursor to head.");
         return 2;
     }
@@ -867,10 +867,10 @@
     psListSetIterator(list,PS_LIST_NEXT);
     if (*(psS32*)psListGetCurrent(list) != 1) {
-        psError(__func__,"Didn't successfully move cursor to next.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't successfully move cursor to next.");
         return 3;
     }
     psListSetIterator(list,PS_LIST_NEXT);
     if (*(psS32*)psListGetCurrent(list) != 2) {
-        psError(__func__,"Didn't successfully move cursor to next twice.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't successfully move cursor to next twice.");
         return 4;
     }
@@ -879,10 +879,10 @@
     psListSetIterator(list,PS_LIST_PREVIOUS);
     if (*(psS32*)psListGetCurrent(list) != 1) {
-        psError(__func__,"Didn't successfully move cursor to previous.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't successfully move cursor to previous.");
         return 5;
     }
     psListSetIterator(list,PS_LIST_PREVIOUS);
     if (*(psS32*)psListGetCurrent(list) != 0) {
-        psError(__func__,"Didn't successfully move cursor to previous twice.");
+        psError(PS_ERR_UNKNOWN, true,"Didn't successfully move cursor to previous twice.");
         return 6;
     }
@@ -893,10 +893,10 @@
     psListSetIterator(list,PS_LIST_UNKNOWN);
     if (*(psS32*)psListGetCurrent(list) != 1) {
-        psError(__func__,"PS_LIST_UNKNOWN moved cursor.");
+        psError(PS_ERR_UNKNOWN, true,"PS_LIST_UNKNOWN moved cursor.");
         return 7;
     }
     psListSetIterator(list,PS_LIST_CURRENT);
     if (*(psS32*)psListGetCurrent(list) != 1) {
-        psError(__func__,"PS_LIST_CURRENT moved cursor.");
+        psError(PS_ERR_UNKNOWN, true,"PS_LIST_CURRENT moved cursor.");
         return 8;
     }
@@ -904,25 +904,25 @@
     // test psListGetPrevious/Next
     if (*(psS32*)psListGetNext(list) != 2) {
-        psError(__func__,"psListGetNext didn't move cursor to next.");
+        psError(PS_ERR_UNKNOWN, true,"psListGetNext didn't move cursor to next.");
         return 9;
     }
     if (*(psS32*)psListGetNext(list) != 3) {
-        psError(__func__,"psListGetNext didn't move cursor to next.");
+        psError(PS_ERR_UNKNOWN, true,"psListGetNext didn't move cursor to next.");
         return 10;
     }
     if (*(psS32*)psListGetPrevious(list) != 2) {
-        psError(__func__,"psListGetPrevious didn't move cursor to previous.");
+        psError(PS_ERR_UNKNOWN, true,"psListGetPrevious didn't move cursor to previous.");
         return 11;
     }
     if (*(psS32*)psListGetPrevious(list) != 1) {
-        psError(__func__,"psListGetPrevious didn't move cursor to previous.");
+        psError(PS_ERR_UNKNOWN, true,"psListGetPrevious didn't move cursor to previous.");
         return 12;
     }
     if (*(psS32*)psListGetPrevious(list) != 0) {
-        psError(__func__,"psListGetPrevious didn't move cursor to previous..");
+        psError(PS_ERR_UNKNOWN, true,"psListGetPrevious didn't move cursor to previous..");
         return 13;
     }
     if (psListGetPrevious(list) != NULL) {
-        psError(__func__,"psListGetPrevious moved cursor beyond head.");
+        psError(PS_ERR_UNKNOWN, true,"psListGetPrevious moved cursor beyond head.");
         return 14;
     }
@@ -930,5 +930,5 @@
     psListSetIterator(list,PS_LIST_TAIL); // works according to an above test
     if (psListGetNext(list) != NULL) {
-        psError(__func__,"psListGetNext moved cursor beyond tail.");
+        psError(PS_ERR_UNKNOWN, true,"psListGetNext moved cursor beyond tail.");
         return 15;
     }
@@ -959,5 +959,5 @@
         psListAdd(list,PS_LIST_TAIL,data[lcv]);
         if (psMemGetRefCounter(data[lcv]) != 2) {
-            psError(__func__,"Reference counter for data was not incremented");
+            psError(PS_ERR_UNKNOWN, true,"Reference counter for data was not incremented");
             return 1;
         }
@@ -969,5 +969,5 @@
     */
     if (list->size != 15) {
-        psError(__func__,"List wasn't populated as expected?");
+        psError(PS_ERR_UNKNOWN, true,"List wasn't populated as expected?");
         return 2;
     }
@@ -989,5 +989,5 @@
     for (psS32 i=0;i<15;i++) {
         if (psMemGetRefCounter(data[i]) != 1) {
-            psError(__func__,"pslistFree didn't decrement the data item's reference counter");
+            psError(PS_ERR_UNKNOWN, true,"pslistFree didn't decrement the data item's reference counter");
             return 3;
         }
@@ -1039,5 +1039,5 @@
             iter = psListGet(list,PS_LIST_NEXT)) {
         if (*prevValue > *iter) {
-            psError(__func__,"Hey, the list wasn't sorted!?");
+            psError(PS_ERR_UNKNOWN, true,"Hey, the list wasn't sorted!?");
             return 1;
         }
@@ -1059,5 +1059,5 @@
             iter = psListGet(list,PS_LIST_NEXT)) {
         if (*prevValue < *iter) {
-            psError(__func__,"Hey, the list wasn't sorted!?");
+            psError(PS_ERR_UNKNOWN, true,"Hey, the list wasn't sorted!?");
             return 1;
         }
@@ -1105,5 +1105,5 @@
             iter = psListGet(list,PS_LIST_NEXT)) {
         if (*prev > *iter) {
-            psError(__func__,"Hey, the list wasn't sorted!?");
+            psError(PS_ERR_UNKNOWN, true,"Hey, the list wasn't sorted!?");
             return 1;
         }
@@ -1125,5 +1125,5 @@
             iter = psListGet(list,PS_LIST_NEXT)) {
         if (*prev < *iter) {
-            psError(__func__,"Hey, the list wasn't sorted!?");
+            psError(PS_ERR_UNKNOWN, true,"Hey, the list wasn't sorted!?");
             return 1;
         }
Index: trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 2273)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -227,5 +227,5 @@
     metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
     if (metadata1 != NULL ) {
-        psError(__func__,"psMetadataReadHeader did not return null when invalid ext given.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null when invalid ext given.");
         return 10;
     }
@@ -238,5 +238,5 @@
     metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits");
     if (metadata1 != NULL ) {
-        psError(__func__,"psMetadataReadHeader did not return null invalid extname give.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null invalid extname give.");
         return 11;
     }
@@ -249,5 +249,5 @@
     metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits");
     if (metadata1 != NULL ) {
-        psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
         return 12;
     }
Index: trunk/psLib/test/collections/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 2273)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92,5 +92,5 @@
     badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD");
     if (badItem != NULL) {
-        psError(__func__,"psMetadataItemAlloc did not return null with null name item.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item.");
         return 10;
     }
Index: trunk/psLib/test/collections/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 2273)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -91,17 +91,17 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name");
     if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem did not return true when adding by name.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
         return 10;
     }
     if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) {
-        psError(__func__,"psMetadataAddItem did not return true when adding by name.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
         return 11;
     }
     if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) {
-        psError(__func__,"psMetadataRemove did not return true when removing by name.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
         return 12;
     }
     if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) {
-        psError(__func__,"psMetadataRemove did not return true when removing by name.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
         return 13;
     }
@@ -112,17 +112,17 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index");
     if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem did not return true when adding by index.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
         return 14;
     }
     if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) {
-        psError(__func__,"psMetadataAddItem did not return true when adding by index.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
         return 15;
     }
     if( ! psMetadataRemove(metadata, 0, NULL) ) {
-        psError(__func__,"psMetadataRemove did not return true when removing by index.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index.");
         return 16;
     }
     if ( ! psMetadataRemove(metadata, 0, NULL ) ) {
-        psError(__func__,"psMetadataRemove did not return true when removing by index.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index.");
         return 17;
     }
@@ -134,5 +134,5 @@
                             "Null metadata collection not allowed", 0);
     if ( psMetadataRemove(NULL, 0, NULL) ) {
-        psError(__func__,"psMetadataRemove did not return false when removing from null metadata.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing from null metadata.");
         return 18;
     }
@@ -144,5 +144,5 @@
                             "Couldn't find metadata item. Name: AARGH", 0);
     if( psMetadataRemove(metadata, 0, "AARGH") ) {
-        psError(__func__,"psMetadataRemove did not return false when removing non-existant item.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item.");
         return 19;
     }
@@ -154,5 +154,5 @@
                             "Couldn't find metadata item in list. Index: 22", 0);
     if( psMetadataRemove(metadata, 22, NULL) ) {
-        psError(__func__,"psMetadataRemove did not return false when removing non-existant item.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item.");
         return 20;
     }
@@ -167,9 +167,9 @@
     errMetadata->table = NULL;
     if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
         return 21;
     }
     if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) {
-        psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table.");
         return 31;
     }
@@ -183,9 +183,9 @@
     errMetadata->list = NULL;
     if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list.");
         return 22;
     }
     if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) {
-        psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list.");
         return 32;
     }
@@ -199,5 +199,5 @@
     errItem->name = NULL;
     if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem did not return false with item with null name.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false with item with null name.");
         return 23;
     }
@@ -211,5 +211,5 @@
     errMetadata->table = NULL;
     if ( psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32,"Integer",22) ) {
-        psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
         return 24;
     }
@@ -227,5 +227,5 @@
     psFree(errMetadata);
     if( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
-        psError(__func__,"Memory leaks detected.");
+        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
         return 25;
     }
Index: trunk/psLib/test/collections/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 2273)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -108,5 +108,5 @@
                             "Null metadata collection not allowed", 0);
     if ( psMetadataLookup(NULL, "myItem2") != NULL ) {
-        psError(__func__,"psMetadataLookup did not return NULL with null metadata.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return NULL with null metadata.");
         return 11;
     }
@@ -118,5 +118,5 @@
                             "Null key name not allowed", 0);
     if ( psMetadataLookup(metadata, NULL) != NULL ) {
-        psError(__func__,"psMetadata did not return NULL with null key.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with null key.");
         return 12;
     }
@@ -128,5 +128,5 @@
                             "Couldn't find metadata item. Name: AARGH", 0);
     if ( psMetadataLookup(metadata, "AARGH") != NULL ) {
-        psError(__func__,"psMetadata did not return NULL with a non-existant item.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with a non-existant item.");
         return 13;
     }
@@ -150,5 +150,5 @@
     item = psMetadataGet(NULL, 0);
     if ( item != NULL ) {
-        psError(__func__,"psMetadataGet did not return NULL with null metadata structure.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure.");
         return 15;
     }
@@ -160,5 +160,5 @@
                             "Couldn't find metadata item with given index. Index: 22", 0);
     if ( psMetadataGet(metadata, 22) != NULL ) {
-        psError(__func__,"psMetadataGet did not return NULL with non-existant metadata item.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item.");
         return 16;
     }
@@ -171,5 +171,5 @@
     metadata->table = NULL;
     if ( psMetadataLookup(metadata,"myItem2") != NULL ) {
-        psError(__func__,"psMetadataLookup did not return null for invalid metadata object.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
         return 20;
     }
@@ -183,5 +183,5 @@
     metadata->list = NULL;
     if ( psMetadataGet(metadata,0) != NULL ) {
-        psError(__func__,"psMetadataLookup did not return null for invalid metadata object.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
         return 20;
     }
@@ -197,5 +197,5 @@
     psFree(item4);
     if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
-        psError(__func__,"memory leaks detected.");
+        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");
         return 20;
     }
Index: trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2273)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -145,5 +145,5 @@
     }
     if( psMetadataGetPrevious(metadata,"myItem3",1) == NULL) {
-        psError(__func__,"psMetadataGetPrevious did not return an item from metadata.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return an item from metadata.");
         return 45;
     }
@@ -151,5 +151,5 @@
     metadata->list = NULL;
     if ( psMetadataGetPrevious(metadata,NULL,1) != NULL) {
-        psError(__func__,"psMetadataGetPrevious did not return null for invalid metadata.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return null for invalid metadata.");
         return 50;
     }
@@ -213,5 +213,5 @@
                             "Null metadata collection not allowed", 0);
     if( psMetadataGetNext(NULL, "myItem2", 0) != NULL ) {
-        psError(__func__,"psMetadataGetNext did not return null for null metadata.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for null metadata.");
         return 40;
     }
@@ -219,5 +219,5 @@
     metadata->list = NULL;
     if ( psMetadataGetNext(metadata, "myItem2", 0) != NULL ) {
-        psError(__func__,"psMetadataGetNext did not return null for invalid metadata.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for invalid metadata.");
         return 41;
     }
@@ -267,5 +267,5 @@
     psFree(item8);
     if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
-        psError(__func__,"Memory leaks detected.");
+        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
         return 50;
     }
Index: trunk/psLib/test/collections/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 2204)
+++ trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 2273)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -88,9 +88,9 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
     if( ! psMetadataAddItem(metadata, item1a, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem returned false for adding a node top.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top.");
         return 20;
     }
     if ( ! psMetadataAddItem(metadata, item1b, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem returned false for adding a node top.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top.");
         return 21;
     }
@@ -102,5 +102,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
     if ( ! psMetadataAddItem(metadata, item1c, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem return false for adding a not to existing node.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem return false for adding a not to existing node.");
         return 22;
     }
@@ -111,9 +111,9 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
     if ( ! psMetadataAddItem(metadata, item2a, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem returned false for adding a node to existing leaf node.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node to existing leaf node.");
         return 23;
     }
     if ( ! psMetadataAddItem(metadata, item2b, PS_LIST_HEAD) ) {
-        psError(__func__,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
+        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
         return 24;
     }
@@ -130,5 +130,5 @@
     psFree(metadata);
     if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
-        psError(__func__,"Memory leaks detected.");
+        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
         return 25;
     }