Changeset 7300 for trunk/psLib/src/fits

Timestamp:

Jun 2, 2006, 11:33:34 AM (20 years ago)

Author:

Paul Price

Message:

Applying patches from RHL.

• Correctly detect cfitsio 3 (ffdkopn)
• Add PS_ERR_FITS_BAD
• Free memory leaks caused by extra columns with FITS tables
• Report error for singular matrices in LMM
• Add psErrorCodeLast
• Write psAbort errors, even if logging is off; flush the file descriptor
• Useful macro: PS_FILE_LINE
• Print a newline if the last character of a trace lacks one
• When moving arguments down, set the vacated slot to NULL (so that original is valid)
• If nFail is omitted, push an error if appropriate

Location:

trunk/psLib/src/fits

Files:

• psFits.c (modified) (2 diffs)
• psFitsTable.c (modified) (2 diffs)

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-25 23:53:07 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 21:33:33 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
-
+#include "config.h"
 #include <unistd.h>
 
@@ -54 +54 @@
             char fitsErr[MAX_STRING_LENGTH];
             fits_get_errstatus(status, fitsErr);
-            psError(PS_ERR_IO, true,
+            psError(PS_ERR_BAD_FITS, true,
                     "Error while closing psFits object. CFITSIO error: %s",
                     fitsErr);

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-27 02:01:23 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 21:33:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -909 +909 @@
 
     //create list of column names and types.
+    if (columns->n > 0) {  // If we're going decrement columns->n (why?), at least free the memory
+        psFree(columns->data[columns->n - 1]);
+    }
     columns->n--;
     psArray* columnNames = psArrayAlloc(columns->n);