Changeset 14675 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Aug 27, 2007, 11:56:17 AM (19 years ago)

Author:

Paul Price

Message:

Plugging memory leak.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (6 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-23 23:45:05 $
+ *  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-27 21:56:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -544 +544 @@
             char *cameraName = argv[argNum]; // symbolic name of the camera
 
-            // look for the CAMERAS list in config->site
+            // look for the CAMERAS list in config->site
             psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS");
             if (!cameras) {
@@ -553 +553 @@
 
             // look for the symbolic camera name in the CAMERAS metadata
-            char *cameraFile = psMetadataLookupStr(&mdok, cameras, cameraName); // The filename
-            if (!cameraFile) {
+            char *cameraFile = psMetadataLookupStr(&mdok, cameras, cameraName); // The filename
+            if (!cameraFile) {
                 psError(PS_ERR_IO, false, "%s is not listed in the site CAMERAS list\n", cameraName);
                 psFree(config);
@@ -560 +560 @@
             }
 
-            // load this camera's configuration informatoin
+            // load this camera's configuration informatoin
             if (!pmConfigFileRead(&config->camera, cameraFile, "camera")) {
                 psError(PM_ERR_CONFIG, false, "Problem reading %s", cameraName);
@@ -566 +566 @@
                 return NULL;
             }
-            // save the name for future uses
-            config->cameraName = psStringCopy (cameraName);
-            
+            // save the name for future uses
+            config->cameraName = psStringCopy (cameraName);
+
             psArgumentRemove(argNum, argc, argv);
 
@@ -1007 +1007 @@
         config->format = format;
     } else {
+        psFree(format);
         psFree(name);
     }