Changeset 18033 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Jun 9, 2008, 1:53:19 PM (18 years ago)

Author:

eugene

Message:

add in an assert on some elements of the returned pmFPAfile; plug a leak

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -21 +21 @@
 
 #include "pmConcepts.h"
+
+# define FPA_TEST_ASSERT(A){ \
+        assert(A->format == NULL); \
+        assert(A->formatName == NULL); \
+        assert(A->filerule == NULL); \
+        assert(A->filesrc == NULL); }
 
 // Parse an option from a metadata, returning the appropriate integer value
@@ -511 +517 @@
         return NULL;
     }
+    psFree (file->filerule); // this is set in pmFPAfileDefineInput 
     file->format = format;
     file->formatName = formatName;
-
-    // adjust the rules to identify these files in the file->names data
     file->filerule = psStringCopy("@FILES");
     file->filesrc = psStringCopy("{CHIP.NAME}.{CELL.NAME}");
+    // we use the above rules to identify these files in the file->names data
 
     file->fileLevel = pmFPAPHULevel(format);
@@ -655 +661 @@
 
     // define the rule to identify these files in the file->names data
+    FPA_TEST_ASSERT (file);
     psFree (file->filerule);
     psFree (file->filesrc);
@@ -825 +832 @@
         return NULL;
     }
+    FPA_TEST_ASSERT (file);
     file->format = format;
     file->formatName = formatName;
-
-    // adjust the rules to identify these files in the file->names data
     file->filerule = psStringCopy ("@FILES");
     file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
+    // adjust the above rules to identify these files in the file->names data
 
     file->fileLevel = pmFPAPHULevel(format);