Index: trunk/psLib/src/collections/psMetadata.c
===================================================================
--- trunk/psLib/src/collections/psMetadata.c	(revision 3990)
+++ trunk/psLib/src/collections/psMetadata.c	(revision 4029)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-16 19:43:53 $
+*  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-25 20:26:55 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -179,5 +179,5 @@
 
 
-    PS_PTR_CHECK_NULL(name,NULL);
+    PS_ASSERT_PTR_NON_NULL(name,NULL);
 
     // Allocate metadata item
@@ -275,9 +275,9 @@
     psMetadataItem *existingEntry = NULL;
 
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->table,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-    PS_PTR_CHECK_NULL(metadataItem,NULL);
-    PS_PTR_CHECK_NULL(metadataItem->name,NULL);
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
+    PS_ASSERT_PTR_NON_NULL(metadataItem,NULL);
+    PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL);
 
     mdTable = md->table;
@@ -410,10 +410,10 @@
 psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key)
 {
-    PS_PTR_CHECK_NULL(md,NULL);
-
-    PS_PTR_CHECK_NULL(md->list,NULL);
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psList* mdList = md->list;
 
-    PS_PTR_CHECK_NULL(md->table,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
     psHash* mdTable = md->table;
 
@@ -482,7 +482,7 @@
 
 
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->table,NULL);
-    PS_PTR_CHECK_NULL(key,NULL);
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
+    PS_ASSERT_PTR_NON_NULL(key,NULL);
 
     mdTable = md->table;
@@ -583,6 +583,6 @@
     psMetadataItem* entry = NULL;
 
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
 
     entry = (psMetadataItem*) psListGet(md->list, where);
@@ -599,6 +599,6 @@
         const char* regex)
 {
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
 
     psMetadataIterator* newIter = psAlloc(sizeof(psMetadataIterator));
@@ -637,8 +637,8 @@
     psMetadataItem* cursor;
 
-    PS_PTR_CHECK_NULL(iterator,NULL);
+    PS_ASSERT_PTR_NON_NULL(iterator,NULL);
 
     psListIterator* iter = iterator->iter;
-    PS_PTR_CHECK_NULL(iterator->iter,NULL);
+    PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
 
     regex_t* preg = iterator->preg;
@@ -686,8 +686,8 @@
     psMetadataItem* oldValue;
 
-    PS_PTR_CHECK_NULL(iterator,NULL);
+    PS_ASSERT_PTR_NON_NULL(iterator,NULL);
 
     psListIterator* iter = iterator->iter;
-    PS_PTR_CHECK_NULL(iterator->iter,NULL);
+    PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
 
     regex_t* preg = iterator->preg;
@@ -714,8 +714,8 @@
     psMetadataItem* oldValue;
 
-    PS_PTR_CHECK_NULL(iterator,NULL);
+    PS_ASSERT_PTR_NON_NULL(iterator,NULL);
 
     psListIterator* iter = iterator->iter;
-    PS_PTR_CHECK_NULL(iterator->iter,NULL);
+    PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
 
     regex_t* preg = iterator->preg;
Index: trunk/psLib/src/collections/psMetadataIO.c
===================================================================
--- trunk/psLib/src/collections/psMetadataIO.c	(revision 3990)
+++ trunk/psLib/src/collections/psMetadataIO.c	(revision 4029)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-19 20:48:28 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-25 20:26:55 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -368,7 +368,7 @@
     psBool success = true;
 
-    PS_PTR_CHECK_NULL(fd, success);
-    PS_PTR_CHECK_NULL(format, success);
-    PS_PTR_CHECK_NULL(metadataItem, success);
+    PS_ASSERT_PTR_NON_NULL(fd, success);
+    PS_ASSERT_PTR_NON_NULL(format, success);
+    PS_ASSERT_PTR_NON_NULL(metadataItem, success);
 
     type = metadataItem->type;
@@ -469,5 +469,5 @@
     fitsfile *fd = NULL;
 
-    PS_PTR_CHECK_NULL(fileName,NULL);
+    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
 
     fits_open_file(&fd, fileName, READONLY, &status);
@@ -1086,8 +1086,8 @@
 
     // Check for NULL file name
-    PS_PTR_CHECK_NULL(fileName,NULL);
+    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
 
     // Check for NULL nFail
-    PS_PTR_CHECK_NULL(nFail,NULL);
+    PS_ASSERT_PTR_NON_NULL(nFail,NULL);
 
     // Attempt to open specified file
@@ -1156,9 +1156,9 @@
     // Get and check initial data pointers
     ctxt = (xmlParserCtxtPtr)ctx;
-    PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
     md = (psMetadata*)ctxt->sax->_private;
-    PS_PTR_CHECK_NULL_GENERAL(md, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
     input = (xmlParserInputPtr)ctxt->input;
-    PS_PTR_CHECK_NULL_GENERAL(input, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
@@ -1173,5 +1173,5 @@
         psHashAdd(htAtts, "tagName", psTagName);
     } else {
-        PS_PTR_CHECK_NULL_GENERAL(psTagName, return);
+        PS_ASSERT_GENERAL_PTR_NON_NULL(psTagName, return);
         psFree(htAtts);
         psFree(psTagName);
@@ -1193,5 +1193,5 @@
                 psFree(psAttValue);
             } else {
-                PS_PTR_CHECK_NULL_GENERAL(psAttValue, return);
+                PS_ASSERT_GENERAL_PTR_NON_NULL(psAttValue, return);
                 psFree(htAtts);
                 psFree(psTagName);
@@ -1237,17 +1237,17 @@
     // Get and check initial data pointers
     ctxt = (xmlParserCtxtPtr)ctx;
-    PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
     md = (psMetadata*)ctxt->sax->_private;
-    PS_PTR_CHECK_NULL_GENERAL(md, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
     input = (xmlParserInputPtr)ctxt->input;
-    PS_PTR_CHECK_NULL_GENERAL(input, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
     metadataItem = psMetadataLookup(md, "htAtts");
-    PS_PTR_CHECK_NULL_GENERAL(metadataItem, return);
-    PS_PTR_CHECK_NULL_GENERAL(metadataItem->data.list, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem->data.list, return);
     metadataItem = (psMetadataItem*)psListGet(metadataItem->data.list,PS_LIST_TAIL);
     htAtts = (psHash*)metadataItem->data.list;
-    PS_PTR_CHECK_NULL_GENERAL(htAtts, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return);
     fileName = (char*)input->filename;
-    PS_PTR_CHECK_NULL_GENERAL(fileName, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return);
     lineNumber = input->line;
 
@@ -1386,17 +1386,17 @@
     // Get and check initial data pointers
     ctxt = (xmlParserCtxtPtr)ctx;
-    PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
     md = (psMetadata*)ctxt->sax->_private;
-    PS_PTR_CHECK_NULL_GENERAL(md, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
     input = (xmlParserInputPtr)ctxt->input;
-    PS_PTR_CHECK_NULL_GENERAL(input, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
     tables = psMetadataLookup(md, "htAtts");
-    PS_PTR_CHECK_NULL_GENERAL(tables, return);
-    PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return);
     table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL);
     htAtts = (psHash*)table->data.list;
-    PS_PTR_CHECK_NULL_GENERAL(htAtts, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return);
     fileName = (char*)input->filename;
-    PS_PTR_CHECK_NULL_GENERAL(fileName, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return);
     lineNumber = input->line;
 
@@ -1427,5 +1427,5 @@
 
     strValue = psHashLookup(htAtts, "value");
-    PS_PTR_CHECK_NULL_GENERAL(strValue, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(strValue, return);
 
 
@@ -1482,15 +1482,15 @@
     // Get and check initial data pointers
     ctxt = (xmlParserCtxtPtr)ctx;
-    PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
     md = (psMetadata*)ctxt->sax->_private;
-    PS_PTR_CHECK_NULL_GENERAL(md, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
     input = (xmlParserInputPtr)ctxt->input;
-    PS_PTR_CHECK_NULL_GENERAL(input, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
     tables = psMetadataLookup(md, "htAtts");
-    PS_PTR_CHECK_NULL_GENERAL(tables, return);
-    PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return);
     table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL);
     htAtts = (psHash*)table->data.list;
-    PS_PTR_CHECK_NULL_GENERAL(htAtts, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return);
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
@@ -1499,5 +1499,5 @@
     // Compare start and end tag names
     psStartTagName = psHashLookup(htAtts, "tagName");
-    PS_PTR_CHECK_NULL_GENERAL(psStartTagName, return);
+    PS_ASSERT_GENERAL_PTR_NON_NULL(psStartTagName, return);
     if(strcmp(psEndTagName, psStartTagName)) {
         psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_TAG_MISMATCH, psStartTagName, psEndTagName);
@@ -1527,5 +1527,5 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(fileName, NULL);
+    PS_ASSERT_PTR_NON_NULL(fileName, NULL);
 
     // Allocate metadata if necessary