Changeset 7926

Timestamp:

Jul 18, 2006, 5:31:54 AM (20 years ago)

Author:

rhl

Message:

1/ Check for illegal values of pmFPAfileDefineOutput's save parameter
2/ Replace another if if if block by if else if else if

File:

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

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -167 +167 @@
         if (!strcasecmp (type, "SX"))     {
             file->type = PM_FPA_FILE_SX;
-        }
-        if (!strcasecmp (type, "OBJ"))     {
+        } else if (!strcasecmp (type, "OBJ"))     {
             file->type = PM_FPA_FILE_OBJ;
-        }
-        if (!strcasecmp (type, "CMP"))     {
+        } else if (!strcasecmp (type, "CMP"))     {
             file->type = PM_FPA_FILE_CMP;
-        }
-        if (!strcasecmp (type, "CMF"))     {
+        } else if (!strcasecmp (type, "CMF"))     {
             file->type = PM_FPA_FILE_CMF;
-        }
-        if (!strcasecmp (type, "RAW"))     {
+        } else if (!strcasecmp (type, "RAW"))     {
             file->type = PM_FPA_FILE_RAW;
-        }
-        if (!strcasecmp (type, "IMAGE"))     {
+        } else if (!strcasecmp (type, "IMAGE"))     {
             file->type = PM_FPA_FILE_IMAGE;
-        }
-        if (!strcasecmp (type, "PSF"))     {
+        } else if (!strcasecmp (type, "PSF"))     {
             file->type = PM_FPA_FILE_PSF;
-        }
-        if (!strcasecmp (type, "JPEG"))     {
+        } else if (!strcasecmp (type, "JPEG"))     {
             file->type = PM_FPA_FILE_JPEG;
         }
@@ -201 +194 @@
         if (!strcasecmp (save, "TRUE"))     {
             file->save = true;
-        }
-        if (!strcasecmp (save, "FALSE"))     {
+        } else if (!strcasecmp (save, "FALSE"))     {
             file->save = false;
+        } else {
+            psError(PS_ERR_IO, true, "Illegal value \"%s\" for FILE.SAVE for %s", save, name);
+            return NULL;
         }
     }