Changeset 7278 for trunk/psModules/src/camera/pmFPARead.c

Timestamp:

Jun 1, 2006, 2:55:23 PM (20 years ago)

Author:

Paul Price

Message:

Addition of a vast quantity of assertions in public functions. Adopted a policy of using assert() within file-static functions (since they are only called internally, any errors there are problems with the program) and using the PS_ASSERT_WHATEVER() macros within public functions. Cleaned a few things up in the process.

File:

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

trunk/psModules/src/camera/pmFPARead.c

@@ -27 +27 @@
                         )
 {
+    assert(readout);
+    assert(image);
+    assert(trimsec);
+    assert(biassecs);
+
     // The image corresponding to the trim region
     if (psRegionIsBad(*trimsec)) {
@@ -85 +90 @@
                              )
 {
+    assert(fits);
+    assert(region);
+
     bool resize = false;                // Do we need to resize the image once read?
     psRegion toRead = psRegionSet(region->x0, region->x1, region->y0, region->y1); // Region to read
@@ -158 +166 @@
                       )
 {
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+    PS_ASSERT_INT_NONNEGATIVE(z, false);
+    PS_ASSERT_INT_NONNEGATIVE(numScans, false);
+
     // Get the HDU and read the header
     pmCell *cell = readout->parent;     // The parent cell
@@ -298 +311 @@
                )
 {
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     pmHDU *hdu = pmHDUFromCell(cell);   // The HDU
     if (!hdu) {
@@ -345 +361 @@
                )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     bool success = false;               // Were we able to read at least one HDU?
     psArray *cells = chip->cells;       // Array of cells
@@ -366 +385 @@
               )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     bool success = false;               // Were we able to read at least one HDU?
     psArray *chips = fpa->chips;        // Array of chips