Changeset 25027 for branches/pap/psModules/src/config/pmConfig.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/config/pmConfig.c (modified) (2 diffs)

branches/pap/psModules/src/config/pmConfig.c

@@ -243 +243 @@
     unsigned int numBadLines = 0;
     struct stat filestat;
+
+    pmErrorRegister();
 
     psTrace("psModules.config", 3, "Loading %s configuration from file %s\n",
@@ -1496 +1498 @@
                 }
             }
+            globfree(&globList);
         }
         psFree (words);