Changeset 27065

Timestamp:

Feb 24, 2010, 2:57:57 PM (16 years ago)

Author:

Paul Price

Message:

Being better about errors.

Location:

trunk/psastro/src

Files:

• psastroDataSave.c (modified) (2 diffs)
• psastroMetadataStats.c (modified) (3 diffs)

trunk/psastro/src/psastroDataSave.c

@@ -92 +92 @@
         pmConfigRecipesCull(config, "PPIMAGE,PPSTATS,PSPHOT,MASKS,PSASTRO");
 
-        pmConfigDump(config, dump_file);
+        if (!pmConfigDump(config, dump_file)) {
+            psError(psErrorCodeLast(), false, "Unable to dump configuration.");
+            psFree(view);
+            return false;
+        }
     }
 
@@ -100 +104 @@
 
     psFree (view);
+
     return true;
 }

trunk/psastro/src/psastroMetadataStats.c

@@ -46 +46 @@
     }
 
+    psFree(view);
+
     // if we did not request any specific stats, the structure is empty
     if (stats && stats->list->n == 0) {
         psWarning ("stats output specified, but no requested stats entries in headers");
-        psFree(view);
         return true;
     }
@@ -62 +63 @@
     // convert to a real UNIX filename
     psString resolved = pmConfigConvertFilename(filename, config, true, false); // Resolved filename
+    if (!resolved) {
+        psError(psErrorCodeLast(), false, "Unable to resolve statistics filename: %s", filename);
+        psFree(statsMDC);
+        return false;
+    }
     FILE *statsFile = fopen (resolved, "w");
     if (!statsFile) {
         psError(PS_ERR_IO, true, "Unable to open statistics file %s for writing.\n", resolved);
-        psFree(view);
         psFree(statsMDC);
         psFree(resolved);
@@ -72 +77 @@
 
     // write the stats MDC to a file
-    fprintf(statsFile, "%s", statsMDC);
-    fclose(statsFile);
+    if (fprintf(statsFile, "%s", statsMDC) != strlen(statsMDC)) {
+        psError(PS_ERR_IO, false, "Unable to write statistics file %s", resolved);
+        psFree(statsMDC);
+        psFree(resolved);
+        return false;
+    }
+    psFree(statsMDC);
+    if (fclose(statsFile) == EOF) {
+        psError(PS_ERR_IO, false, "Unable to write statistics file %s", resolved);
+        psFree(resolved);
+        return false;
+    }
+
+    psFree(resolved);
 
     pmConfigRunFilenameAddWrite(config, "STATS", filename);
 
-    psFree(resolved);
-    psFree(statsMDC);
-    psFree(view);
     return true;
 }