Changeset 15109

Timestamp:

Sep 29, 2007, 11:54:35 AM (19 years ago)

Author:

Paul Price

Message:

Fixing SEGVs in keywordInList.

File:

• branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c (modified) (5 diffs)

branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.34.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 03:08:05 $
+ *  @version $Revision: 1.34.4.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-29 21:54:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
 
 // list of FITS header keys to ignore; NULL-terminated
-static const char* ignoreFitsKeys[] = {"", NULL};
+static const char* ignoreFitsKeys[] = { "", NULL};
 
 // List of FITS header keys that may be duplicated; NULL-terminated
-static const char *duplicateFitsKeys[] = {"COMMENT", "HIERARCH", "HISTORY", NULL};
+static const char *duplicateFitsKeys[] = { "COMMENT", "HIERARCH", "HISTORY", NULL};
 
 // List of FITS header keys not to write (handled by cfitsio); NULL-terminated
-static const char *noWriteFitsKeys[] = {"SIMPLE", "XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE", "BZERO",
-                                        "TFIELDS", NULL};
+static const char *noWriteFitsKeys[] = { "SIMPLE", "XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE",
+                                         "BZERO", "TFIELDS", NULL};
 
 // List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated
-static const char *noWriteFitsKeyStarts[] = {"NAXIS", "TTYPE", "TFORM", NULL};
+static const char *noWriteFitsKeyStarts[] = { "NAXIS", "TTYPE", "TFORM", NULL};
 
 // List of FITS header keys that may be present if the header is considered "empty"; NULL-terminated
@@ -57 +57 @@
     )
 {
-    for (const char **check = list; *check; *check++) {
+    for (const char **check = list; *check; ++check) {
         if (strcmp(keyword, *check) == 0) {
             return true;
@@ -71 +71 @@
     PS_ASSERT_METADATA_NON_NULL(header, false);
 
-    int hduNum = 0;                     // Which HDU we're at
-    fits_get_hdu_num(fits->fd, &hduNum);  /* Get the current output HDU position */
-
-    if (hduNum != 1) {
+    if (psFitsGetExtNum(fits) != 0) {
         // It's not the PHU, so it can't be an empty PHU!
         return false;
@@ -93 +90 @@
         }
     }
+    psFree(iter);
 
     return true;