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

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

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

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

@@ -306 +306 @@
     *config = psMetadataConfigRead(NULL, &numBadLines, realName, true);
     if (numBadLines > 0) {
-        psError(PM_ERR_CONFIG, false, "%d bad lines in %s configuration file (%s)",
+        psError(PM_ERR_CONFIG, true, "%d bad lines in %s configuration file (%s)",
                 numBadLines, description, realName);
         psFree (realName);
@@ -1751 +1751 @@
     psMetadataItem *item = psMetadataLookup(camera, "FILERULES"); // Item with the file rule of interest
     if (!item) {
-        psError(PM_ERR_CONFIG, false, "Unable to find FILERULES in the camera configuration.");
+        psError(PM_ERR_CONFIG, true, "Unable to find FILERULES in the camera configuration.");
         return NULL;
     }
@@ -1771 +1771 @@
     }
 
-    return psMetadataLookupMetadata(&mdok, filerules, realname);
+    return psMetadataLookupMetadata(NULL, filerules, realname);
 }