Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 7249)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 7278)
@@ -22,9 +22,9 @@
 #include "pmFPA_JPEG.h"
 
-static void pmFPAfileFree (pmFPAfile *file)
-{
-
-    if (file == NULL)
+static void pmFPAfileFree(pmFPAfile *file)
+{
+    if (!file) {
         return;
+    }
 
     psFree (file->fpa);
@@ -54,9 +54,8 @@
 }
 
-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,9 +82,14 @@
     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,4 +247,6 @@
 bool pmFPAfileOpen (pmFPAfile *file, const pmFPAview *view)
 {
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_PTR_NON_NULL(view, false);
 
     bool status;
@@ -325,6 +331,9 @@
 }
 
-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,6 +387,8 @@
 }
 
-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,4 +447,7 @@
 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,4 +492,7 @@
 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,5 +541,7 @@
 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,4 +574,7 @@
 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,6 +599,10 @@
 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,13 +611,17 @@
 
     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,4 +640,9 @@
 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,4 +664,7 @@
 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,4 +718,6 @@
 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,4 +788,10 @@
 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,13 +801,16 @@
     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,4 +885,10 @@
 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,8 +903,10 @@
     // 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,4 +971,9 @@
 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,4 +990,9 @@
 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,6 +1001,7 @@
     psArray *infiles = NULL;
 
-    if (*found)
-        return NULL;
+    if (*found) {
+        return NULL;
+    }
 
     // a camera config is needed (as source of file rule)
@@ -951,6 +1019,7 @@
 
     // 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,6 +1033,7 @@
         infiles->data[0] = psStringCopy (file->filerule);
     }
-    if (infiles == NULL)
-        return NULL;
+    if (infiles == NULL) {
+        return NULL;
+    }
     if (infiles->n < 1) {
         psFree (infiles);
@@ -1018,4 +1088,9 @@
 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,4 +1111,8 @@
 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,4 +1157,8 @@
 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,4 +1195,9 @@
 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) {