Changeset 2273 for trunk/psLib/test/astronomy/tst_psMetadata_05.c

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

• trunk/psLib/test/astronomy/tst_psMetadata_05.c (modified) (6 diffs)

trunk/psLib/test/astronomy/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @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 +145 @@
     }
     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 +151 @@
     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 +213 @@
                             "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 +219 @@
     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 +267 @@
     psFree(item8);
     if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
-        psError(__func__,"Memory leaks detected.");
+        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
         return 50;
     }