Changeset 6743 for branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c

Timestamp:

Mar 30, 2006, 3:33:07 PM (20 years ago)

Author:

Paul Price

Message:

Plugging memory leaks --- done.

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c (modified) (5 diffs)

branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c

@@ -204 +204 @@
                         psTrace(__func__, 8, "Writing %s to header %s\n", name, cameraItem->data.V);
                         writeHeader(hdu, cameraItem->data.V, formatted);
-                        continue;
-                    }
-                    if (strcasecmp(source, "VALUE") == 0) {
+                    } else if (strcasecmp(source, "VALUE") == 0) {
                         psTrace(__func__, 8, "Checking %s against camera format.\n", name);
                         if (! compareConcepts(cameraItem, formatted)) {
@@ -212 +210 @@
                                      "format, but the values don't match.\n", name);
                         }
-                        continue;
+                    } else {
+                        psLogMsg(__func__, PS_LOG_WARN, "Concept source %s isn't HEADER or VALUE --- can't "
+                                 "write\n", nameSource);
                     }
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept source %s isn't HEADER or VALUE --- can't "
-                             "write\n", nameSource);
-                    continue;
-                }
-                // Assume it's specified by value
-                if (! compareConcepts(cameraItem, formatted)) {
+                } else if (! compareConcepts(cameraItem, formatted)) {
+                    // Assume it's specified by value
                     psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
                              "format, but the values don't match.\n", name);
                 }
+                psFree(formatted);
+                psFree(nameSource);
             }
 
@@ -232 +230 @@
 }
 
-
+// XXX: Needs the .DEPEND stuff
 bool pmConceptsWriteToDefaults(psMetadata *specs, // The concept specifications
                                pmFPA *fpa, // The FPA
@@ -266 +264 @@
                              "format, but the values don't match.\n");
                 }
+                psFree(formatted);
             }
         }
@@ -331 +330 @@
                     writeHeader(hdu, keyword, formatted);
                 }
+                psFree(formatted);
+                psFree(keywords);
             }
         }