Changeset 27134

Timestamp:

Mar 2, 2010, 11:11:19 AM (16 years ago)

Author:

Paul Price

Message:

Making the assertion that the FITS filehandle has been closed optional and controllable. In the event that an I/O error occurs on the final close, we don't want to produce a failed assertion because we can't close the file.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (2 diffs)
• pmFPAfile.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -22 +22 @@
 static int fileNum = 0;                 // Number of file
 
+static bool fpaFileFreeStrict = true;   // Strict checking when file has been freed?
+
+bool pmFPAfileFreeSetStrict(bool new)
+{
+    bool old = fpaFileFreeStrict;       // Old value, to return
+    fpaFileFreeStrict = new;
+    return old;
+}
+
 static void pmFPAfileFree(pmFPAfile *file)
 {
@@ -28 +37 @@
     }
 
-    psAssert(file->fits == NULL, "File %s wasn't closed.", file->name);
+    psAssert(!fpaFileFreeStrict || file->fits == NULL, "File %s wasn't closed.", file->name);
 
     psTrace ("pmFPAfileFree", 5, "freeing %s\n", file->name);

trunk/psModules/src/camera/pmFPAfile.h

@@ -162 +162 @@
     );
 
+/// Set strict checking when freeing file
+///
+/// If true (default), freeing a pmFPAfile involves asserting that the FITS filehandle has been closed.
+bool pmFPAfileFreeSetStrict(bool new    // New state
+    );