Changeset 7410 for trunk/psModules/src/concepts/pmConceptsRead.c

Timestamp:

Jun 7, 2006, 12:55:47 PM (20 years ago)

Author:

rhl

Message:

1/ Always call psError(..., true, ...) or psErrorClear() when detecting
a new error
2/ Fix a memory leak with headerItem

File:

• trunk/psModules/src/concepts/pmConceptsRead.c (modified) (10 diffs)

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -62 +62 @@
 
     if (!concept) {
+        psError(PS_ERR_UNKNOWN, true, "Concept is NULL");
         return false;
     }
@@ -115 +116 @@
     PS_ASSERT_PTR_NON_NULL(target, false);
     if (!cell) {
+        psError(PS_ERR_UNKNOWN, true, "cell is NULL");
         return false;
     }
@@ -120 +122 @@
     pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
     if (!hdu) {
+        psError(PS_ERR_UNKNOWN, true, "Can't find HDU for cell");
         return false;
     }
@@ -178 +181 @@
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
+        psError(PS_ERR_UNKNOWN, true, "Can't find HDU for cell");
         return false;
     }
@@ -184 +188 @@
     psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     if (!mdok || !defaults) {
+        psError(PS_ERR_IO, true, "Failed to find \"DEFAULTS\"");
         return false;
     }
@@ -189 +194 @@
     psMetadataItem *specItem = NULL;    // Item from the specs metadata
     bool status = true;                 // Status of reading concepts
+    psErrorClear();   // we're going to declare all errors "old" => won't clear stack
     while ((specItem = psMetadataGetAndIncrement(specsIter))) {
         pmConceptSpec *spec = specItem->data.V; // The specification
@@ -215 +221 @@
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
+        psError(PS_ERR_UNKNOWN, true, "Can't find HDU at lowest level");
         return false;
     }
@@ -221 +228 @@
     psMetadata *transSpec = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     if (!mdok || !transSpec) {
+        psError(PS_ERR_IO, true, "Failed to find \"TRANSLATION\"");
         return false;
     }
@@ -253 +261 @@
                 if (keys->n == 1) {
                     // Only one key --- proceed as usual
-                    headerItem = psMetadataLookup(hdu->header, keywords);
+                    headerItem = psMemIncrRefCounter(psMetadataLookup(hdu->header, keywords));
                 } else {
                     psListIterator *keysIter = psListIteratorAlloc(keys, PS_LIST_HEAD, false); // Iterator
@@ -275 +283 @@
             status = false;
         }
+        psFree(headerItem);
     }
     psFree(specsIter);