Changeset 7278 for trunk/psModules/src/camera

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.

Location:

trunk/psModules/src/camera

Files:

• pmChipMosaic.c (modified) (6 diffs)
• pmFPA.c (modified) (2 diffs)
• pmFPAConstruct.c (modified) (10 diffs)
• pmFPACopy.c (modified) (6 diffs)
• pmFPACopy.h (modified) (1 diff)
• pmFPAHeader.c (modified) (2 diffs)
• pmFPARead.c (modified) (6 diffs)
• pmFPAUtils.c (modified) (2 diffs)
• pmFPAWrite.c (modified) (4 diffs)
• pmFPA_JPEG.c (modified) (6 diffs)
• pmFPAfile.c (modified) (28 diffs)
• pmFPAview.c (modified) (13 diffs)
• pmHDU.c (modified) (4 diffs)
• pmHDUGenerate.c (modified) (3 diffs)
• pmHDUUtils.c (modified) (5 diffs)

trunk/psModules/src/camera/pmChipMosaic.c

@@ -41 +41 @@
                           )
 {
+    assert(bounds);
+    assert(chip);
+
     if (primary) {
         *bounds = psRegionSet(INFINITY, 0, INFINITY, 0);
@@ -104 +107 @@
                          )
 {
+    assert(xBinChip);
+    assert(yBinChip);
+    assert(chip);
+
     // Check that we've got the HDU in the chip or the FPA
     if ((!chip->hdu || !chip->hdu->images) && (!chip->parent->hdu || !chip->parent->hdu->images)) {
@@ -358 +365 @@
                         )
 {
+    assert(target);
+    assert(sources);
+    assert(xBin > 0 && yBin > 0);
+    assert(trimsec);
+
     bool success = true;                // Result of setting everything
     float gain       = 0.0;             // Gain
@@ -433 +445 @@
     }
 
-
     return success;
 }
@@ -446 +457 @@
                )
 {
+    assert(mosaicImage);
+    assert(mosaicMask);
+    assert(mosaicWeights);
+    assert(chip);
+
     psArray *cells = chip->cells;       // The array of cells
     int numCells = cells->n;            // Number of cells
@@ -587 +603 @@
                  )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+
     psImage *mosaicImage   = NULL;      // The mosaic image
     psImage *mosaicMask    = NULL;      // The mosaic mask

trunk/psModules/src/camera/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-01 22:43:26 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-02 00:55:22 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -399 +399 @@
 }
 
-bool pmChipSetFileStatus pmChip *chip, bool status)
+bool pmChipSetFileStatus(pmChip *chip, bool status)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -21 +21 @@
                               )
 {
+    assert(format);
+    assert(cellName && strlen(cellName) > 0);
+
     bool status = true;                 // Result of MD lookup
     psMetadata *cells = psMetadataLookupMD(&status, format, "CELLS"); // The CELLS
@@ -43 +46 @@
                         )
 {
+    assert(first);
+    assert(second);
+    assert(third);
+    assert(string && strlen(string) > 0);
+
     bool allOK = true;                  // Everything was OK?
     psList *values = psStringSplit(string, " ,;", true); // List of the parts
@@ -96 +104 @@
                                  )
 {
+    assert(name && strlen(name) > 0);
+    assert(fileInfo);
+    assert(header);
+
     bool mdok = true;                   // Result of MD lookup
     psString keyword = psMetadataLookupStr(&mdok, fileInfo, name);
@@ -188 +200 @@
                              )
 {
+    assert(fileInfo);
+    assert(contents);
+    assert(header);
+
     bool mdok = true;                   // Status of MD lookup
     const char *contentHeaders = psMetadataLookupStr(&mdok, fileInfo, "CONTENT"); // Headers for content
@@ -237 +253 @@
     assert(contents && strlen(contents) > 0);
     assert(!cell || (cell && chip));    // Need both chip and cell if given a cell
+    assert(format);
 
     if (hdu && level == PM_FPA_LEVEL_FPA) {
@@ -329 +346 @@
                           )
 {
+    assert(format);
+
     bool mdok = true;                   // Status of MD lookup
     psMetadata *file = psMetadataLookupMD(&mdok, format, "FILE"); // File information
@@ -363 +382 @@
                      )
 {
+    PS_ASSERT_PTR_NON_NULL(camera, NULL);
+
     pmFPA *fpa = pmFPAAlloc(camera);    // The FPA to fill out
 
@@ -400 +421 @@
                            )
 {
-    assert(fpa);
-    assert(phuView);
-    assert(format);
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(phuView, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
 
     // Where does the PHU go?
@@ -495 +516 @@
                                    )
 {
-    assert(fpa);
-    assert(phu);
-    assert(format);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+    PS_ASSERT_PTR_NON_NULL(phu, NULL);
+    PS_ASSERT_PTR_NON_NULL(format, NULL);
 
     bool mdok = true;                   // Status from metadata lookups
@@ -689 +710 @@
                )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa,);
+
     psTrace(__func__, 1, "FPA:\n");
     if (fpa->hdu) {

trunk/psModules/src/camera/pmFPACopy.c

@@ -24 +24 @@
                           )
 {
+    assert(source);
+
     psImage *copy = psMemIncrRefCounter(source);
     bool copied = false;                // Have the pixels been copied?
@@ -51 +53 @@
                      )
 {
+    assert(region);
+    assert(xBin > 0);
+    assert(yBin > 0);
+
     // Want to include the lower bound: 1 binned by 4 --> 0; 3 binned by 4 --> 0; 4 binned by 4 --> 1
     region->x0 = (int)(region->x0 / xBin);
@@ -62 +68 @@
                      )
 {
+    assert(cell);
+
     if (cell->hdu && cell->hdu->phu) {
         return cell->hdu;
@@ -274 +282 @@
     assert(target);
     assert(source);
+    assert(xBin > 0);
+    assert(yBin > 0);
 
     psArray *targetCells = target->cells; // The target cells
@@ -300 +310 @@
 }
 
-static int fpaCopy(pmFPA *target,            // The target FPA
-                   pmFPA *source,            // The source FPA, to be copied
-                   bool pixels,              // Copy the pixels?
-                   int xBin, int yBin        // (Relative) binning factors in x and y
-                  )
+static bool fpaCopy(pmFPA *target,            // The target FPA
+                    pmFPA *source,            // The source FPA, to be copied
+                    bool pixels,              // Copy the pixels?
+                    int xBin, int yBin        // (Relative) binning factors in x and y
+                   )
 {
     assert(target);
     assert(source);
+    assert(xBin > 0);
+    assert(yBin > 0);
 
     psArray *targetChips = target->chips; // The target chips
@@ -338 +350 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-int pmFPACopy(pmFPA *target,            // The target FPA
-              pmFPA *source             // The source FPA, to be copied
-             )
-{
+bool pmFPACopy(pmFPA *target,            // The target FPA
+               pmFPA *source             // The source FPA, to be copied
+              )
+{
+    PS_ASSERT_PTR_NON_NULL(target, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
     return fpaCopy(target, source, true, 1, 1);
 }
 
-int pmChipCopy(pmChip *target,          // The target chip
-               pmChip *source           // The source chip, to be copied
-              )
-{
+bool pmChipCopy(pmChip *target,          // The target chip
+                pmChip *source           // The source chip, to be copied
+               )
+{
+    PS_ASSERT_PTR_NON_NULL(target, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
     return chipCopy(target, source, true, 1, 1);
 }
 
-int pmCellCopy(pmCell *target,          // The target cell
-               pmCell *source           // The source cell, to be copied
-              )
-{
+bool pmCellCopy(pmCell *target,          // The target cell
+                pmCell *source           // The source cell, to be copied
+               )
+{
+    PS_ASSERT_PTR_NON_NULL(target, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
     return cellCopy(target, source, true, 1, 1);
 }
 
 
-int pmFPACopyStructure(pmFPA *target,   // The target FPA
-                       pmFPA *source,   // The source FPA, to be copied
-                       int xBin, int yBin // Binning factors in x and y
-                      )
-{
-    return fpaCopy(target, source, false, xBin, yBin);
-}
-
-int pmChipCopyStructure(pmChip *target, // The target chip
-                        pmChip *source, // The source chip, to be copied
+bool pmFPACopyStructure(pmFPA *target,   // The target FPA
+                        pmFPA *source,   // The source FPA, to be copied
                         int xBin, int yBin // Binning factors in x and y
                        )
 {
+    PS_ASSERT_PTR_NON_NULL(target, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_INT_POSITIVE(xBin, false);
+    PS_ASSERT_INT_POSITIVE(yBin, false);
+    return fpaCopy(target, source, false, xBin, yBin);
+}
+
+bool pmChipCopyStructure(pmChip *target, // The target chip
+                         pmChip *source, // The source chip, to be copied
+                         int xBin, int yBin // Binning factors in x and y
+                        )
+{
+    PS_ASSERT_PTR_NON_NULL(target, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_INT_POSITIVE(xBin, false);
+    PS_ASSERT_INT_POSITIVE(yBin, false);
     return chipCopy(target, source, false, xBin, yBin);
 }
 
-int pmCellCopyStructure(pmCell *target, // The target cell
-                        pmCell *source, // The source cell, to be copied
-                        int xBin, int yBin // Binning factors in x and y
-                       )
-{
+bool pmCellCopyStructure(pmCell *target, // The target cell
+                         pmCell *source, // The source cell, to be copied
+                         int xBin, int yBin // Binning factors in x and y
+                        )
+{
+    PS_ASSERT_PTR_NON_NULL(target, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_INT_POSITIVE(xBin, false);
+    PS_ASSERT_INT_POSITIVE(yBin, false);
     return cellCopy(target, source, false, xBin, yBin);
 }

trunk/psModules/src/camera/pmFPACopy.h

@@ -3 +3 @@
 
 // Copy the FPA components, including the pixels
-int pmFPACopy(pmFPA *target,            // The target FPA
-              pmFPA *source             // The source FPA, to be copied
-             );
-int pmChipCopy(pmChip *target,          // The target chip
-               pmChip *source           // The source chip, to be copied
+bool pmFPACopy(pmFPA *target,            // The target FPA
+               pmFPA *source             // The source FPA, to be copied
               );
-int pmCellCopy(pmCell *target,          // The target cell
-               pmCell *source           // The source cell, to be copied
-              );
+bool pmChipCopy(pmChip *target,          // The target chip
+                pmChip *source           // The source chip, to be copied
+               );
+bool pmCellCopy(pmCell *target,          // The target cell
+                pmCell *source           // The source cell, to be copied
+               );
 
 // Versions that copy the structure and not the pixels; they also allow binning
-int pmFPACopyStructure(pmFPA *target,   // The target FPA
-                       pmFPA *source,   // The source FPA, to be copied
-                       int xBin, int yBin     // Binning factors in x and y
-                      );
-int pmChipCopyStructure(pmChip *target, // The target chip
-                        pmChip *source, // The source chip, to be copied
-                        int xBin, int yBin   // Binning factors in x and y
+bool pmFPACopyStructure(pmFPA *target,   // The target FPA
+                        pmFPA *source,   // The source FPA, to be copied
+                        int xBin, int yBin     // Binning factors in x and y
                        );
-int pmCellCopyStructure(pmCell *target, // The target cell
-                        pmCell *source, // The source cell, to be copied
-                        int xBin, int yBin // Binning factors in x and y
-                       );
+bool pmChipCopyStructure(pmChip *target, // The target chip
+                         pmChip *source, // The source chip, to be copied
+                         int xBin, int yBin   // Binning factors in x and y
+                        );
+bool pmCellCopyStructure(pmCell *target, // The target cell
+                         pmCell *source, // The source cell, to be copied
+                         int xBin, int yBin // Binning factors in x and y
+                        );
 
 

trunk/psModules/src/camera/pmFPAHeader.c

@@ -15 +15 @@
                         )
 {
+    assert(chip);
+
     bool status = true;                 // Status of concept reading
     status |= pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, false, NULL);
@@ -33 +35 @@
                        )
 {
+    assert(fpa);
+
     bool status = true;                 // Status of concept reading
     status |= pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);

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

trunk/psModules/src/camera/pmFPAUtils.c

@@ -9 +9 @@
                  )
 {
-    psArray *chips = fpa->chips;    // Array of chips
+    PS_ASSERT_PTR_NON_NULL(fpa, -1);
+    PS_ASSERT_PTR_NON_NULL(name, -1);
+    if (strlen(name) == 0) {
+        return -1;
+    }
+
+    psArray *chips = fpa->chips;        // Array of chips
     for (int i = 0; i < chips->n; i++) {
         pmChip *chip = chips->data[i]; // The chip of interest
@@ -27 +33 @@
                   )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, -1);
+    PS_ASSERT_PTR_NON_NULL(name, -1);
+    if (strlen(name) == 0) {
+        return -1;
+    }
+
     psArray *cells = chip->cells;    // Array of cells
     for (int i = 0; i < cells->n; i++) {

trunk/psModules/src/camera/pmFPAWrite.c

@@ -16 +16 @@
                        )
 {
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     pmHDU *hdu = pmHDUFromReadout(readout); // The HDU to which to write
     if (!hdu) {
@@ -87 +90 @@
                 )
 {
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     pmHDU *hdu = cell->hdu;             // The HDU
     if (!hdu) {
@@ -118 +124 @@
                 )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     pmHDU *hdu = chip->hdu;             // The HDU
     if (!hdu) {
@@ -156 +165 @@
                )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     pmHDU *hdu = fpa->hdu;              // The HDU
     if (!hdu) {

trunk/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:55:43 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 00:55:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 
 
-bool pmFPAviewWriteJPEG (const pmFPAview *view, pmFPAfile *file)
+bool pmFPAviewWriteJPEG(const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
 
     pmFPA *fpa = file->fpa;
@@ -70 +72 @@
 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
 
     for (int i = 0; i < fpa->chips->n; i++) {
@@ -82 +87 @@
 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
 
     for (int i = 0; i < chip->cells->n; i++) {
@@ -94 +102 @@
 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
 
     for (int i = 0; i < cell->readouts->n; i++) {
@@ -106 +117 @@
 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+
     char *name, *mode, *word, *mapname;
     psArray *range;

trunk/psModules/src/camera/pmFPAfile.c

@@ -22 +22 @@
 #include "pmFPA_JPEG.h"
 
-static void pmFPAfileFree (pmFPAfile *file)
-{
-
-    if (file == NULL)
+static void pmFPAfileFree(pmFPAfile *file)
+{
+    if (!file) {
         return;
+    }
 
     psFree (file->fpa);
@@ -54 +54 @@
 }
 
-pmFPAfile *pmFPAfileAlloc ()
-{
-
-    pmFPAfile *file = psAlloc (sizeof(pmFPAfile));
-    psMemSetDeallocator (file, (psFreeFunc) pmFPAfileFree);
+pmFPAfile *pmFPAfileAlloc()
+{
+    pmFPAfile *file = psAlloc(sizeof(pmFPAfile));
+    psMemSetDeallocator(file, (psFreeFunc) pmFPAfileFree);
 
     file->phu = NULL;
@@ -83 +82 @@
     file->state = PM_FPA_STATE_CLOSED;
 
-    return (file);
-}
-
-pmFPAfile *pmFPAfileDefine (psMetadata *files, psMetadata *camera, pmFPA *fpa, char *name)
-{
+    return file;
+}
+
+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);
 
     bool status;
@@ -243 +247 @@
 bool pmFPAfileOpen (pmFPAfile *file, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
 
     bool status;
@@ -325 +331 @@
 }
 
-bool pmFPAfileRead (pmFPAfile *file, const pmFPAview *view)
-{
+bool pmFPAfileRead(pmFPAfile *file, const pmFPAview *view)
+{
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+
     if (file->state & PM_FPA_STATE_INACTIVE)
         return false;
@@ -378 +387 @@
 }
 
-bool pmFPAfileWrite (pmFPAfile *file, const pmFPAview *view)
-{
+bool pmFPAfileWrite(pmFPAfile *file, const pmFPAview *view)
+{
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
 
     if (file->state & PM_FPA_STATE_INACTIVE) {
@@ -436 +447 @@
 bool pmFPAfileCreate (pmFPAfile *file, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+
     if (file->state & PM_FPA_STATE_INACTIVE) {
         return false;
@@ -478 +492 @@
 bool pmFPAfileClose (pmFPAfile *file, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+
     if (file->state & PM_FPA_STATE_INACTIVE) {
         return false;
@@ -524 +541 @@
 bool pmFPAfileActivate (psMetadata *files, bool state, char *name)
 {
-    if (name == NULL) {
+    PS_ASSERT_PTR_NON_NULL(files, false);
+
+    if (!name) {
         psMetadataItem *item = NULL;
         psMetadataIterator *iter = psMetadataIteratorAlloc (files, PS_LIST_HEAD, NULL);
@@ -555 +574 @@
 bool pmFPAfileIOChecks (psMetadata *files, const pmFPAview *view, pmFPAfilePlace place)
 {
+    PS_ASSERT_PTR_NON_NULL(files, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+
     // recipe override values (command-line options):
     psMetadataItem *item = NULL;
@@ -577 +599 @@
 pmReadout *pmFPAfileCreateInternal (psMetadata *files, char *name, int Nx, int Ny, int type)
 {
-    pmReadout *readout = pmReadoutAlloc (NULL);
-    readout->image = psImageAlloc (Nx, Ny, type);
+    PS_ASSERT_PTR_NON_NULL(files, false);
+    PS_ASSERT_PTR_NON_NULL(name, false);
+    PS_ASSERT_INT_POSITIVE(strlen(name), false);
+
+    pmReadout *readout = pmReadoutAlloc(NULL);
+    readout->image = psImageAlloc(Nx, Ny, type);
 
     // I want an image from the
@@ -585 +611 @@
 
     file->readout = readout;
-    psMetadataAddPtr (files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN, "", file);
-    psFree (file);
+    psMetadataAddPtr(files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN, "", file);
+    psFree(file);
     // we free this copy of file, but 'files' still has a copy
 
-    return (readout);
-}
-
-bool pmFPAfileDropInternal (psMetadata *files, char *name)
-{
+    return readout;
+}
+
+bool pmFPAfileDropInternal(psMetadata *files, char *name)
+{
+    PS_ASSERT_PTR_NON_NULL(files, false);
+    PS_ASSERT_PTR_NON_NULL(name, false);
+    PS_ASSERT_INT_POSITIVE(strlen(name), false);
+
     bool status;
 
@@ -610 +640 @@
 pmReadout *pmFPAfileThisReadout (psMetadata *files, const pmFPAview *view, const char *name)
 {
+    PS_ASSERT_PTR_NON_NULL(files, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(name, false);
+    PS_ASSERT_INT_POSITIVE(strlen(name), false);
+
     bool status;
 
@@ -629 +664 @@
 bool pmFPAviewReadFitsImage (const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+
     bool status;
     pmFPA *fpa = file->fpa;
@@ -680 +718 @@
 bool pmFPAviewWriteFitsImage (const pmFPAview *view, pmFPAfile *file)
 {
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
 
     pmFPA *fpa = file->fpa;
@@ -748 +788 @@
 pmFPAfile *pmFPAfileFromArgs (bool *found, pmConfig *config, char *filename, char *argname)
 {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(filename, false);
+    PS_ASSERT_INT_POSITIVE(strlen(filename), false);
+    PS_ASSERT_PTR_NON_NULL(argname, false);
+    PS_ASSERT_INT_POSITIVE(strlen(argname), false);
+
     bool status;
     pmFPA *fpa = NULL;
@@ -755 +801 @@
     psMetadata *format = NULL;
 
-    if (*found)
-        return NULL;
+    if (*found) {
+        return NULL;
+    }
 
     // we search the argument data for the named fileset (argname)
     psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname);
-    if (!status)
-        return NULL;
-    if (infiles->n < 1)
-        return NULL;
+    if (!status) {
+        return NULL;
+    }
+    if (infiles->n < 1) {
+        return NULL;
+    }
 
     // determine the current format from the header
@@ -836 +885 @@
 pmFPAfile *pmFPAfileSetFromArgs (bool *found, pmConfig *config, char *filename, char *argname)
 {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(filename, false);
+    PS_ASSERT_INT_POSITIVE(strlen(filename), false);
+    PS_ASSERT_PTR_NON_NULL(argname, false);
+    PS_ASSERT_INT_POSITIVE(strlen(argname), false);
+
     bool status;
     pmFPA *fpa = NULL;
@@ -848 +903 @@
     // we search the argument data for the named fileset (argname)
     psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname);
-    if (!status)
-        return NULL;
-    if (infiles->n < 1)
-        return NULL;
+    if (!status) {
+        return NULL;
+    }
+    if (infiles->n < 1) {
+        return NULL;
+    }
 
     // determine the current format from the header
@@ -914 +971 @@
 pmFPAfile *pmFPAfileFromFPA (pmConfig *config, pmFPA *src, int xBin, int yBin, char *filename)
 {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(src, false);
+    PS_ASSERT_PTR_NON_NULL(filename, false);
+    PS_ASSERT_INT_POSITIVE(strlen(filename), false);
+
     // XXX pmFPAConstruct has many leaks (6919)
     pmFPA *fpa = pmFPAConstruct (config->camera);
@@ -928 +990 @@
 pmFPAfile *pmFPAfileFromConf (bool *found, pmConfig *config, char *filename, pmFPA *input)
 {
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(filename, false);
+    PS_ASSERT_INT_POSITIVE(strlen(filename), false);
+    PS_ASSERT_PTR_NON_NULL(input, false);
+
     psFits *fits = NULL;
     pmFPAfile *file = NULL;
@@ -934 +1001 @@
     psArray *infiles = NULL;
 
-    if (*found)
-        return NULL;
+    if (*found) {
+        return NULL;
+    }
 
     // a camera config is needed (as source of file rule)
@@ -951 +1019 @@
 
     // image names come from the file->name list?
-    if (!strcasecmp (file->filerule, "@FILES"))
+    if (!strcasecmp (file->filerule, "@FILES")) {
         psAbort ("pmFPAfileFromConfig", "programming error");
+    }
 
     // image needs to come from the detrend database
@@ -964 +1033 @@
         infiles->data[0] = psStringCopy (file->filerule);
     }
-    if (infiles == NULL)
-        return NULL;
+    if (infiles == NULL) {
+        return NULL;
+    }
     if (infiles->n < 1) {
         psFree (infiles);
@@ -1018 +1088 @@
 bool pmFPAfileAddFileNames (psMetadata *files, char *name, char *value, int mode)
 {
+    PS_ASSERT_PTR_NON_NULL(files, false);
+    PS_ASSERT_PTR_NON_NULL(name, false);
+    PS_ASSERT_INT_POSITIVE(strlen(name), false);
+    PS_ASSERT_PTR_NON_NULL(value, false);
+    PS_ASSERT_INT_POSITIVE(strlen(value), false);
 
     // add the output names to the output-type files
@@ -1036 +1111 @@
 char *pmFPAfileNameFromRule (char *rule, pmFPAfile *file, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(rule, NULL);
+    PS_ASSERT_INT_POSITIVE(strlen(rule), NULL);
+    PS_ASSERT_PTR_NON_NULL(file, NULL);
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
 
     char *newName = NULL;     // destination for resulting name
@@ -1078 +1157 @@
 bool pmFPAfileCopyView (pmFPA *out, pmFPA *in, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(out, false);
+    PS_ASSERT_PTR_NON_NULL(in, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+
     // pmFPAWrite takes care of all PHUs as needed
     if (view->chip == -1) {
@@ -1112 +1195 @@
 bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, psMetadata *format, int xBin, int yBin, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(out, false);
+    PS_ASSERT_PTR_NON_NULL(in, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
+
     // pmFPAWrite takes care of all PHUs as needed
     if (view->chip == -1) {

trunk/psModules/src/camera/pmFPAview.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:55:43 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 00:55:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include "pmFPAview.h"
 
-static void pmFPAviewFree (pmFPAview *view)
-{
-    if (view == NULL)
-        return;
+static void pmFPAviewFree(pmFPAview *view)
+{
+    // No reason to keep this function, apart from the fact that it allows us to type the memBlock
     return;
 }
 
-pmFPAview *pmFPAviewAlloc (int nRows)
-{
-    pmFPAview *view = psAlloc (sizeof(pmFPAview));
-    psMemSetDeallocator (view, (psFreeFunc) pmFPAviewFree);
+pmFPAview *pmFPAviewAlloc(int nRows)
+{
+    pmFPAview *view = psAlloc(sizeof(pmFPAview));
+    psMemSetDeallocator(view, (psFreeFunc) pmFPAviewFree);
 
     view->chip    = -1;
@@ -36 +35 @@
     view->iRows   =  0;
     view->nRows   = nRows;
-    return (view);
-}
-
-pmFPAdepth pmFPAviewDepth (const pmFPAview *view)
-{
+    return view;
+}
+
+pmFPAdepth pmFPAviewDepth(const pmFPAview *view)
+{
+    PS_ASSERT_PTR_NON_NULL(view, PM_FPA_DEPTH_NONE);
 
     if (view->chip < 0) {
@@ -54 +54 @@
 }
 
-pmChip *pmFPAviewThisChip (const pmFPAview *view, pmFPA *fpa)
-{
+pmChip *pmFPAviewThisChip(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     if (view->chip < 0) {
@@ -69 +71 @@
 }
 
-pmChip *pmFPAviewNextChip (pmFPAview *view, pmFPA *fpa, int nStep)
-{
+pmChip *pmFPAviewNextChip(pmFPAview *view, pmFPA *fpa, int nStep)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
     view->cell = -1;
     view->readout = -1;
@@ -100 +105 @@
 }
 
-pmCell *pmFPAviewThisCell (const pmFPAview *view, pmFPA *fpa)
-{
+pmCell *pmFPAviewThisCell(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     if (view->cell < 0) {
@@ -108 +115 @@
 
     pmChip *chip = pmFPAviewThisChip (view, fpa);
-    if (chip == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
 
     if (view->cell >= chip->cells->n) {
@@ -122 +127 @@
 pmCell *pmFPAviewNextCell (pmFPAview *view, pmFPA *fpa, int nStep)
 {
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     pmChip *chip = pmFPAviewThisChip (view, fpa);
-    if (chip == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
 
     view->readout = -1;
@@ -158 +163 @@
 pmReadout *pmFPAviewThisReadout (const pmFPAview *view, pmFPA *fpa)
 {
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     if (view->readout < 0) {
@@ -164 +171 @@
 
     pmCell *cell = pmFPAviewThisCell (view, fpa);
-    if (cell == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
 
     if (view->readout >= cell->readouts->n) {
@@ -178 +183 @@
 pmReadout *pmFPAviewNextReadout (pmFPAview *view, pmFPA *fpa, int nStep)
 {
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     pmCell *cell = pmFPAviewThisCell (view, fpa);
-    if (cell == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
 
     view->iRows = 0;
@@ -211 +216 @@
 }
 
-pmHDU *pmFPAviewThisHDU (const pmFPAview *view, pmFPA *fpa)
-{
+pmHDU *pmFPAviewThisHDU(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
     // the HDU is attached to a cell, chip or fpa
     // if this view has a -1 for the level which contains the hdu,
@@ -229 +237 @@
 }
 
-pmHDU *pmFPAviewThisPHU (const pmFPAview *view, pmFPA *fpa)
-{
+pmHDU *pmFPAviewThisPHU(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
     // select the HDU which corresponds to the PHU containing this view
 

trunk/psModules/src/camera/pmHDU.c

@@ -61 +61 @@
     psMemSetDeallocator(hdu, (psFreeFunc)hduFree);
 
-    if (! extname || strlen(extname) == 0) {
+    if (!extname || strlen(extname) == 0) {
         hdu->phu = true;
         hdu->extname = psStringCopy("PHU");
@@ -86 +86 @@
                     )
 {
-    assert(hdu);
-    assert(fits);
+    PS_ASSERT_PTR_NON_NULL(hdu, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
 
     // Move to the appropriate extension
@@ -113 +113 @@
               )
 {
-    assert(hdu);
-    assert(fits);
+    PS_ASSERT_PTR_NON_NULL(hdu, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
 
     // Read the header; includes the move
@@ -159 +159 @@
                )
 {
-    assert(hdu);
-    assert(fits);
+    PS_ASSERT_PTR_NON_NULL(hdu, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
 
     psTrace(__func__, 7, "Writing HDU %s\n", hdu->extname);

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -437 +437 @@
                          )
 {
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+
     // Get the HDU and a list of cells below it
     pmHDU *hdu = pmHDUFromCell(cell); // The HDU in the cell
@@ -487 +489 @@
                          )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+
     // Get the HDU and a list of cells below it
     pmHDU *hdu = pmHDUFromChip(chip);   // The HDU in the chip
@@ -536 +540 @@
                         )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+
     // Get the HDU and a list of cells below it
     pmHDU *hdu = pmHDUFromFPA(fpa);     // The HDU in the FPA

trunk/psModules/src/camera/pmHDUUtils.c

@@ -8 +8 @@
                    )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
     return fpa->hdu;
 }
@@ -14 +15 @@
                     )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
+
     pmHDU *hdu = chip->hdu;             // The HDU information
     if (!hdu) {
@@ -25 +28 @@
                     )
 {
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+
     pmHDU *hdu = cell->hdu;             // The HDU information
     if (!hdu) {
@@ -33 +38 @@
 }
 
-pmHDU *pmHDUFromReadout (pmReadout *readout)
+pmHDU *pmHDUFromReadout(pmReadout *readout)
 {
+    PS_ASSERT_PTR_NON_NULL(readout, NULL);
 
     pmCell *cell = readout->parent; // cell containing this readout;
-    pmHDU *hdu = pmHDUFromCell (cell);
+    pmHDU *hdu = pmHDUFromCell(cell);
     return hdu;
 }
@@ -64 +70 @@
                )
 {
+    PS_ASSERT_PTR_NON_NULL(hdu,);
+
     if (hdu->phu) {
         psTrace(__func__, level, "HDU: %s (PHU)\n", hdu->extname);