Changeset 1546 for trunk/psLib/src/collections/psMetadata.c

Timestamp:

Aug 13, 2004, 4:55:46 PM (22 years ago)

Author:

desonia

Message:

Fixed error where an error in psMetadataFReadHeader closed the fits file.

File:

• trunk/psLib/src/collections/psMetadata.c (modified) (3 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-12 00:40:42 $
+*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-14 02:55:46 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
 /******************************************************************************/
 
-#define FITS_ERROR(STRING,PS_ERROR)                                                                          \
-fits_get_errstatus(status, fitsErr);                                                                     \
-psError( __func__, STRING, PS_ERROR, fitsErr);                                                           \
-status = 0;                                                                                              \
-if(fits_close_file(fd, &status) != 0) {                                                                  \
-    fits_get_errstatus(status, fitsErr);                                                                 \
-    psError( __func__, "FITS error while closing file: ", fitsErr);                                      \
-}                                                                                                        \
+#define FITS_ERROR(STRING,PS_ERROR)                  \
+fits_get_errstatus(status, fitsErr);             \
+psError( __func__, STRING, PS_ERROR, fitsErr);   \
+status = 0;                                      \
 return output;
 
@@ -639 +635 @@
         break;
     case PS_META_S32:
-        fprintf(fd, format, metadataItem->data.S32);
+        fprintf(fd,format, metadataItem->data.S32);
         break;
     case PS_META_F32: