Changeset 9511 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Oct 12, 2006, 11:38:50 AM (20 years ago)

Author:

magnier

Message:

added tests for left-over INTERNAL files

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (6 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -66 +66 @@
     // determine the file name
     // free a name allocated earlier
+    // XXX for CMP files which defer opening, we have an inconsistent value
+    // for file->extra here and in the pmFPAfileDefine fucntions.
+    //
     psFree (file->filename);
     file->filename = pmFPAfileNameFromRule (file->filerule, file, view);
@@ -254 +257 @@
     }
 
+    // an internal file should not be returned to here
+    if (file->mode == PM_FPA_MODE_INTERNAL) {
+        psError(PS_ERR_IO, true, "File is mode PM_FPA_MODE_INTERNAL");
+        return false;
+    }
+
     // get the current level
     pmFPALevel level = pmFPAviewLevel (view);
@@ -325 +334 @@
     }
 
+    // an internal file should not be returned to here
+    if (file->mode == PM_FPA_MODE_INTERNAL) {
+        psError(PS_ERR_IO, true, "File is mode PM_FPA_MODE_INTERNAL");
+        return false;
+    }
+
     // get the current level
     pmFPALevel level = pmFPAviewLevel (view);
@@ -382 +397 @@
         psTrace("psModules.camera", 6, "skip write for %s, mode is not WRITE", file->name);
         return true;
+    }
+
+    // an internal file should not be returned to here
+    if (file->mode == PM_FPA_MODE_INTERNAL) {
+        psError(PS_ERR_IO, true, "File is mode PM_FPA_MODE_INTERNAL");
+        return false;
     }
 
@@ -459 +480 @@
     }
 
+    // an internal file should not be returned to here
+    if (file->mode == PM_FPA_MODE_INTERNAL) {
+        psError(PS_ERR_IO, true, "File is mode PM_FPA_MODE_INTERNAL");
+        return false;
+    }
+
     // get the current level
     pmFPALevel level = pmFPAviewLevel (view);
@@ -510 +537 @@
     if (file->state == PM_FPA_STATE_CLOSED) {
         return true;
+    }
+
+    // an internal file should not be returned to here
+    if (file->mode == PM_FPA_MODE_INTERNAL) {
+        psError(PS_ERR_IO, true, "File is mode PM_FPA_MODE_INTERNAL");
+        return false;
     }