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

Timestamp:

Apr 1, 2008, 8:39:33 AM (18 years ago)

Author:

Paul Price

Message:

Don't error if the file rule can't be found --- it may not exist for all cameras.

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -167 +167 @@
 void pmConfigDone(void)
 {
-    if (configPath) { 
-        psFree(configPath);
+    if (configPath) {
+        psFree(configPath);
     }
     configPath = NULL;
@@ -441 +441 @@
     // XXX why was this being called here?  Is someone calling pmConfigRead multiple times?
     // pmConfigDone();
-    assert (configPath == NULL);  
-
-    // define the config-file search path (configPath).  
+    assert (configPath == NULL);
+
+    // define the config-file search path (configPath).
     psString path = psMetadataLookupStr(NULL, config->user, "PATH");
     pmConfigSet (path);
@@ -589 +589 @@
 
     // XXX read TIME from SITE (or system?)
-    { 
-        bool mdok = true;
+    {
+        bool mdok = true;
 
         // Initialise the psLib time handling
-        // XXX is this still needed / desired?
+        // XXX is this still needed / desired?
         psString timeName = psMetadataLookupStr(&mdok, config->complete, "TIME");
         if (mdok && timeName)
@@ -1510 +1510 @@
     }
 
-    return psMetadataLookupMetadata(NULL, filerules, realname);
-}
-
+    return psMetadataLookupMetadata(&mdok, filerules, realname);
+}
+