Changeset 7443

Timestamp:

Jun 8, 2006, 12:13:31 PM (20 years ago)

Author:

magnier

Message:

added error checking on pmFPAAddSourceFromHeader, dropped invalid assertion on fpa in pmFPAfileDefine, changed a psError to psTrace

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -134 +134 @@
 }
 
-
+// define a pmFPAfile, bind to the optional fpa if supplied
 pmFPAfile *pmFPAfileDefine(psMetadata *files, psMetadata *camera, pmFPA *fpa, char *name)
 {
     PS_ASSERT_PTR_NON_NULL(files, NULL);
     PS_ASSERT_PTR_NON_NULL(camera, NULL);
-    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
     PS_ASSERT_PTR_NON_NULL(name, NULL);
     PS_ASSERT_INT_POSITIVE(strlen(name), NULL);
@@ -932 +931 @@
     psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname);
     if (!status) {
-        psError(PS_ERR_IO, false, "Failed to read %s from metadata\n", argname);
+        psTrace("pmFPAfile", 5, "Failed to find %s in argument list", argname);
         return NULL;
     }
     if (infiles->n < 1) {
-        psError(PS_ERR_IO, false, "Found n == %d files in %s from metadata\n", infiles->n, argname);
+        psError(PS_ERR_IO, false, "Found n == %d files in %s in arguments\n", infiles->n, argname);
         return NULL;
     }
@@ -1218 +1217 @@
         // set the view to the corresponding entry for this phu
         pmFPAview *view = pmFPAAddSourceFromHeader (file->fpa, phu, format);
+        if (!view) {
+            psError(PS_ERR_IO, false, "Unable to determine source for %s", file->name);
+            return NULL;
+        }
 
         // XXX is this the correct psMD to save the filename?