Changeset 14876 for trunk/psLib/src/fits/psFits.c

Timestamp:

Sep 17, 2007, 4:33:48 PM (19 years ago)

Author:

jhoblitt

Message:

psFitsSetCompression() error handling cleanups

File:

• trunk/psLib/src/fits/psFits.c (modified) (3 diffs)

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-17 23:01:00 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-18 02:33:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -594 +594 @@
     }
 
-    int status = false;
-    fits_set_compression_type(fits->fd, comptype, &status);
-    if (!status) {
-        goto ERROR;
+    int status = 0;
+    if (fits_set_compression_type(fits->fd, comptype, &status)) {
+        char fitsErr[MAX_STRING_LENGTH];
+        fits_get_errstatus(status, fitsErr);
+        psError(PS_ERR_BAD_FITS, true,
+            "Error while configuring compression. CFITSIO error: %s", fitsErr);
+        return false;
     }
 
@@ -612 +615 @@
     }
     // status check belongs to fits_set_tile_dim() call
-    if (!status) {
-        goto ERROR;
-    }
-
-    fits_set_noise_bits(fits->fd, noisebits, &status);
-    if (!status) {
-        goto ERROR;
-    }
+    if (status) {
+        fits_set_compression_type(fits->fd, 0x0, &status);
+        char fitsErr[MAX_STRING_LENGTH];
+        fits_get_errstatus(status, fitsErr);
+        psError(PS_ERR_BAD_FITS, true,
+            "Error while configuring compression. CFITSIO error: %s", fitsErr);
+        return false;
+    }
+
+    if (fits_set_noise_bits(fits->fd, noisebits, &status)) {
+        fits_set_compression_type(fits->fd, 0x0, &status);
+        char fitsErr[MAX_STRING_LENGTH];
+        fits_get_errstatus(status, fitsErr);
+        psError(PS_ERR_BAD_FITS, true,
+            "Error while configuring compression. CFITSIO error: %s", fitsErr);
+        return false;
+    }
+
 #if FITS_HCOMP
-    fits_set_hcomp_scale(fits->fd, scale, &status);
-    if (!status) {
-        goto ERROR;
-    }
-    fits_set_hcomp_smooth(fits->fd, smooth, &status);
-    if (!status) {
-        goto ERROR;
+    if (fits_set_hcomp_scale(fits->fd, scale, &status)) {
+        fits_set_compression_type(fits->fd, 0x0, &status);
+        char fitsErr[MAX_STRING_LENGTH];
+        fits_get_errstatus(status, fitsErr);
+        psError(PS_ERR_BAD_FITS, true,
+            "Error while configuring compression. CFITSIO error: %s", fitsErr);
+        return false;
+    }
+    if (fits_set_hcomp_smooth(fits->fd, smooth, &status)) {
+        fits_set_compression_type(fits->fd, 0x0, &status);
+        char fitsErr[MAX_STRING_LENGTH];
+        fits_get_errstatus(status, fitsErr);
+        psError(PS_ERR_BAD_FITS, true,
+            "Error while configuring compression. CFITSIO error: %s", fitsErr);
+        return false;
     }
 #endif // FITS_HCOMP
 
-ERROR:
-    fits_set_compression_type(fits->fd, 0x0, &status);
-    char fitsErr[MAX_STRING_LENGTH];
-    fits_get_errstatus(status, fitsErr);
-    psError(PS_ERR_BAD_FITS, true,
-        "Error while configuring compression. CFITSIO error: %s", fitsErr);
-    return false;
+    return true;
 }