Changeset 4158 for trunk/psLib/src/dataIO/psFits.c

Timestamp:

Jun 8, 2005, 11:07:59 AM (21 years ago)

Author:

desonia

Message:

Bug #410 -- changed the return value of psFitsReadHeaderSet to psMetadata*.

File:

• trunk/psLib/src/dataIO/psFits.c (modified) (4 diffs)

trunk/psLib/src/dataIO/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 21:07:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -571 +571 @@
 }
 
-psHash* psFitsReadHeaderSet(psHash* out,
-                            const psFits* fits)
+psMetadata* psFitsReadHeaderSet(psMetadata* out,
+                                const psFits* fits)
 {
     if (fits == NULL) {
@@ -582 +582 @@
 
     if (out == NULL) {
-        out = psHashAlloc(10);
-        // XXX: what is the appropriate number of buckets? Got 10 from psMetadataAlloc.
+        out = psMetadataAlloc();
         if (out == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    "Failed to allocate a new psHash container.");
+                    "Failed to allocate a new psMetadata container.");
             return NULL;
         }
@@ -607 +606 @@
         psMetadata* header = psFitsReadHeader(NULL, fits);
         if (name != NULL && header != NULL) {
-            psHashAdd(out, name, header);
+            psMetadataAddMetadata(out, PS_LIST_HEAD, name, "FITS Header",
+                                  header);
         } else { // XXX: is this a warning or error?
             psLogMsg(__func__, PS_LOG_WARN,