Changeset 7236

Timestamp:

May 26, 2006, 4:09:47 PM (20 years ago)

Author:

Paul Price

Message:

Missed a curly.

File:

• trunk/psLib/src/fits/psFitsHeader.c (modified) (2 diffs)

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-27 02:09:18 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-27 02:09:47 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -322 +322 @@
 
     return fitsWriteHeader(fits, output, true);
-
-
-    bool psFitsWriteBlank(psFits* fits,
-                          psMetadata* output
-                         ) {
-        if (!fits) {
-            psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
-            return false;
-        }
-
-        if (!output) {
-            psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL);
-            return false;
-        }
-
-        // Create a dummy image HDU for the primary HDU
-        int status = 0;                 // Status of cfitsio
-        fits_create_img(fits->fd, 16, 0, NULL, &status);
-        if (status) {
-            char fitsErr[MAX_STRING_LENGTH];
-            (void)fits_get_errstatus(status, fitsErr);
-            psError(PS_ERR_IO, true, "Unable to create primary header.\n%s\n", fitsErr);
-            return false;
-        }
-
-        return fitsWriteHeader(fits, output, false);
-    }
-
-    bool psFitsHeaderValidate(psMetadata *header) {
-        if (header == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL);
-            return false;
-        }
-
-        // Traverse the metadata list and inspect at each key
-        psListIterator* iter = psListIteratorAlloc(header->list, PS_LIST_HEAD, true); // Iterator
-        psMetadataItem* item;               // Item from iteration
-        bool valid = true;                  // Are all items valid?
-        while ((item = psListGetAndIncrement(iter))) {
-            if (item->type > PS_DATA_STRING) { // i.e., a non-primitive type
-                valid = false;
-            }
-
-            if (strlen(item->name) > 8) {
-                item->name[8] = '\0'; // truncate to 8 characters
-            }
-
-            fits_uppercase(item->name); // make uppercase
-
-            // now, let's see if CFITSIO thinks this is a good keyword...
-            int status = 0;                 // Status from cfitsio calls
-            if (fits_test_keyword(item->name,&status) != 0) {
-                valid = false;
-            }
-        }
-        psFree(iter);
-
-        return valid;
-    }
+}
+
+bool psFitsWriteBlank(psFits* fits,
+                      psMetadata* output
+                     )
+{
+    if (!fits) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
+        return false;
+    }
+
+    if (!output) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL);
+        return false;
+    }
+
+    // Create a dummy image HDU for the primary HDU
+    int status = 0;                 // Status of cfitsio
+    fits_create_img(fits->fd, 16, 0, NULL, &status);
+    if (status) {
+        char fitsErr[MAX_STRING_LENGTH];
+        (void)fits_get_errstatus(status, fitsErr);
+        psError(PS_ERR_IO, true, "Unable to create primary header.\n%s\n", fitsErr);
+        return false;
+    }
+
+    return fitsWriteHeader(fits, output, false);
+}
+
+bool psFitsHeaderValidate(psMetadata *header)
+{
+    if (header == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL);
+        return false;
+    }
+
+    // Traverse the metadata list and inspect at each key
+    psListIterator* iter = psListIteratorAlloc(header->list, PS_LIST_HEAD, true); // Iterator
+    psMetadataItem* item;               // Item from iteration
+    bool valid = true;                  // Are all items valid?
+    while ((item = psListGetAndIncrement(iter))) {
+        if (item->type > PS_DATA_STRING) { // i.e., a non-primitive type
+            valid = false;
+        }
+
+        if (strlen(item->name) > 8) {
+            item->name[8] = '\0'; // truncate to 8 characters
+        }
+
+        fits_uppercase(item->name); // make uppercase
+
+        // now, let's see if CFITSIO thinks this is a good keyword...
+        int status = 0;                 // Status from cfitsio calls
+        if (fits_test_keyword(item->name,&status) != 0) {
+            valid = false;
+        }
+    }
+    psFree(iter);
+
+    return valid;
+}