Changeset 23487 for trunk/magic/remove/src/streaksio.c

Timestamp:

Mar 23, 2009, 9:42:42 AM (17 years ago)

Author:

Paul Price

Message:

Functions declared as 'type function()' cause errors with the Intel compiler ('error #310: old-style parameter list (anachronism)'), which wants 'type function()'. These instances haven't caused problems yet, and I'm trying to avoid that.

File:

• trunk/magic/remove/src/streaksio.c (modified) (14 diffs)

trunk/magic/remove/src/streaksio.c

@@ -75 +75 @@
         }
     }
-     
+
     psElemType tileType;                // Type corresponding to "long"
     if (sizeof(long) == sizeof(psS64)) {
@@ -214 +214 @@
 
         // XXX: I should probably be using a different file rule for diffs, but I don't
-        // have an input rule that takes a diff image. 
+        // have an input rule that takes a diff image.
         // Since they're skycells, this should be compatible
         sfile->pmfile = pmFPAfileDefineFromArgs(&status, config, "PPSUB.INPUT", "INPUT");
@@ -229 +229 @@
         psFree(view);
         sfile->resolved_name = psStringCopy(sfile->pmfile->filename);
-        
+
         // copy header from fpu
         sfile->header = (psMetadata*) psMemIncrRefCounter(sfile->pmfile->fpa->hdu->header);
@@ -248 +248 @@
     }
 
-    // if outputFilename is not null name it contains the "directory" 
+    // if outputFilename is not null name it contains the "directory"
     // and outputFilename is the basename name of the file (or nebulous key)
     // and the file is to be opened for writing
@@ -293 +293 @@
     bool status = psFitsMoveExtNum(sfile->fits, extnum, false);
     if (!status) {
-        psError(PS_ERR_IO, false, 
+        psError(PS_ERR_IO, false,
             "failed to move to extension %d for %s", extnum, sfile->resolved_name);
         streaksExit("", PS_EXIT_DATA_ERROR);
@@ -427 +427 @@
         return true;
     } else if (in->nHDU == 1) {
-        // no extensions in the file, can just return true? For now require 
+        // no extensions in the file, can just return true? For now require
         // at least one dimension
         int naxis =  psMetadataLookupS32(&status, in->header, "NAXIS");
@@ -524 +524 @@
     in->header = psFitsReadHeader(NULL, in->fits);
     if (!in->header) {
-        psError(PS_ERR_IO, false, "failed to read header from %s extnum: %d", 
+        psError(PS_ERR_IO, false, "failed to read header from %s extnum: %d",
             in->resolved_name, extnum);
         streaksExit("", PS_EXIT_DATA_ERROR);
@@ -541 +541 @@
         in->image = psFitsReadImage(in->fits, region, 0);
         if (!in->image) {
-            psError(PS_ERR_IO, false, "failed to read image from %s extnum: %d", 
+            psError(PS_ERR_IO, false, "failed to read image from %s extnum: %d",
                 in->resolved_name, extnum);
             streaksExit("", PS_EXIT_DATA_ERROR);
@@ -559 +559 @@
         in->imagecube = psFitsReadImageCube(in->fits, region);
         if (!in->imagecube) {
-            psError(PS_ERR_IO, false, "failed to read image cube from %s extnum: %d", 
+            psError(PS_ERR_IO, false, "failed to read image cube from %s extnum: %d",
                 in->resolved_name, extnum);
             streaksExit("", PS_EXIT_DATA_ERROR);
@@ -631 +631 @@
         // XXX abort?
         return;
-    } 
+    }
     if (!extname) {
         psWarning("extnum %d has no image and extname not defined in %s",
@@ -689 +689 @@
     }
     if (!psFitsWriteImage(sfile->fits, sfile->header, sfile->image, 0, extname)) {
-        psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d", 
+        psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d",
             sfile->resolved_name, extnum);
         streaksExit("", PS_EXIT_DATA_ERROR);
@@ -706 +706 @@
     }
     if (!psFitsWriteImageCube(sfile->fits, sfile->header, imagecube, extname)) {
-        psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d", 
+        psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d",
             sfile->resolved_name, extnum);
         streaksExit("", PS_EXIT_DATA_ERROR);
@@ -732 +732 @@
     }
     if (sfile->fits && !psFitsClose(sfile->fits)) {
-        psError(PS_ERR_IO, false, "failed to close image to %s", 
+        psError(PS_ERR_IO, false, "failed to close image to %s",
             sfile->resolved_name);
         streaksExit("", PS_EXIT_DATA_ERROR);
@@ -1030 +1030 @@
 
 void
-streaksNebulousCleanup()
+streaksNebulousCleanup(void)
 {
     nebServerFree(ourNebServer);