Changeset 7411 for trunk/psModules/src/concepts/pmConceptsStandard.c

Timestamp:

Jun 7, 2006, 12:56:40 PM (20 years ago)

Author:

rhl

Message:

Always call psError(..., true, ...) or psErrorClear() when detecting
a new error

File:

• trunk/psModules/src/concepts/pmConceptsStandard.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -334 +334 @@
     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     if (!mdok || !formats) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find FORMATS in camera configuration.\n");
+        psError(PS_ERR_UNKNOWN, true, "Unable to find FORMATS in camera configuration.\n");
         return NULL;
     }
 
     psString timeFormat = psMetadataLookupStr(&mdok, formats, "CELL.TIME");
-    if (!mdok || !timeFormat || !strlen(timeFormat)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find CELL.TIME in FORMATS.\n");
+    if (!mdok || strlen(timeFormat) == 0) {
+        psError(PS_ERR_UNKNOWN, true, "Unable to find CELL.TIME in FORMATS.\n");
         return NULL;
     }
@@ -371 +371 @@
             usaTime = false;
         } else {
-            psLogMsg(__func__, PS_LOG_WARN, "Unrecognised FORMATS option for CELL.TIME: %s --- "
-                     "ignored.\n", timeFormat);
+            psError(PS_ERR_UNKNOWN, true, "Unrecognised FORMATS option for CELL.TIME: %s --- "
+                    "ignored.\n", timeFormat);
             psFree(timeFormatsIter);
             psFree(timeFormats);