Changeset 2273 for trunk/psLib/test/astronomy/tst_psMetadata_04.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_04.c (modified) (9 diffs)

trunk/psLib/test/astronomy/tst_psMetadata_04.c

@@ -18 +18 @@
 *  @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 +108 @@
                             "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 +118 @@
                             "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 +128 @@
                             "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 +150 @@
     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 +160 @@
                             "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 +171 @@
     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 +183 @@
     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 +197 @@
     psFree(item4);
     if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
-        psError(__func__,"memory leaks detected.");
+        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");
         return 20;
     }